后端修改

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -389,8 +389,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
         try {
             if (params.get("carNo") == null || StringUtils.isEmpty(params.get("carNo").toString())) {
                 rm.setMessage("车号不能为空！！");
-            } else if (params.get("telNum") == null || StringUtils.isEmpty(params.get("telNum").toString())) {
-                rm.setMessage("手机号不能为空！！");
+            //} else if (params.get("telNum") == null || StringUtils.isEmpty(params.get("telNum").toString())) {
+            //    rm.setMessage("手机号不能为空！！");
             } else {
                 // sso登录
                 SSOUtil ssoUtil = new SSOUtil();
@@ -409,16 +409,16 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         driverInfoMap.put("carId", params.get("carNo"));
                         driverInfoMap.put("validFlag", "0");
                         driverInfoMap.put("telNum", params.get("telNum"));
-                        List<MeterBaseDriver> driverInfo = meterBaseDriverMapper.selectByParameters(driverInfoMap);
+                        //List<MeterBaseDriver> driverInfo = meterBaseDriverMapper.selectByParameters(driverInfoMap);
                         //司机配置表是否有服役的司机信息
-                        if(driverInfo.size() >= 1){
-                            info.put("driverInfo", driverInfo);
+                        //if(driverInfo.size() >= 1){
+                        //    info.put("driverInfo", driverInfo);
                             rm = success();
                             rm.setData(info);
                             rm.setMessage("操作成功");
-                        }else{
-                            rm.setMessage("司机配置表没有服役的司机信息");
-                        }
+                        //}else{
+                        //    rm.setMessage("司机配置表没有服役的司机信息");
+                        //}
                     }else{
                         rm.setMessage("车辆配置表没有服役的车辆信息");
                     }

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -214,7 +214,7 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                     // sso注册
                     if(model.get("password").toString().equals("")) {
                         model.remove("password");
-                        model.put("password", "jg123456");
+                        model.put("password", "a1234567");
                     }
                     SSOUtil ssoUtil = new SSOUtil();
                     HashMap ssoMap = ssoUtil.ssoRegister(model);
@@ -341,13 +341,13 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                 driver.setValidFlag("0");
                 MeterBaseDriver findCar = meterBaseDriverMapper.selectByPrimaryKey(driver.getDriverNo());
                 if(findCar == null) {
-                    driver.setUpdateManNo(userId);
-                    driver.setUpdateManName(userName);
+                    driver.setCreateManNo(userId);
+                    driver.setCreateManName(userName);
                     driver.setCreateTime(new Date());
                     meterBaseDriverMapper.insertSelective(driver);
                 }else {
-                    driver.setCreateManNo(userId);
-                    driver.setCreateManName(userName);
+                    driver.setUpdateManNo(userId);
+                    driver.setUpdateManName(userName);
                     driver.setCreateTime(new Date());
                     meterBaseDriverMapper.updateByPrimaryKeySelective(driver);
                 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/controller/MeterBaseSystemMessageController.java

@@ -138,7 +138,6 @@ public class MeterBaseSystemMessageController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "parma", value = "HashMap", required = true, dataType = "HashMap")
     })
-    //@RequiresPermissions("meterbasesystemmessage:update")
     @PutMapping(value = "/updateIsRead", produces  = "application/json;charset=UTF-8")
     public RESTfulResult updateIsRead(@RequestBody HashMap parma){
         try {
@@ -150,4 +149,23 @@ public class MeterBaseSystemMessageController extends BaseRESTfulController {
         }
         return success();
     }
+
+    @ApiOperation(value="倒序获取通告列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasesystemmessage:view")
+    @GetMapping(value = "/likeDesc/")
+    public RESTfulResult likeDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSystemMessage> list = meterBaseSystemMessageService.likeDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取最新的通告信息-App滚动条显示", notes="分页模糊查询")
+    @GetMapping(value = "/getNews/")
+    public RESTfulResult getNews(){
+        MeterBaseSystemMessage list = meterBaseSystemMessageService.getNews();
+        return success(list);
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.java

@@ -3,6 +3,10 @@ package com.steerinfo.baseinfo.meterbasesystemmessage.mapper;
 import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -10,4 +14,7 @@ public interface MeterBaseSystemMessageMapper extends IBaseMapper<MeterBaseSyste
     String GetNewID();
 
     void updateIsRead(String systemMessageNo);
+
+    List<MeterBaseSystemMessage> likeDesc(HashMap params);
+    List<MeterBaseSystemMessage> getNews();
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/mapper/MeterBaseSystemMessageMapper.xml

@@ -476,4 +476,62 @@
   <update id="updateIsRead" parameterType="java.lang.String">
     update METER_BASE_SYSTEM_MESSAGE set IS_READ = '1' where SYSTEM_MESSAGE_NO = #{systemMessageNo}
   </update>
+
+  <select id="likeDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where> 1 = 1
+      <if test="systemMessageNo != null and systemMessageNo != ''">
+        and SYSTEM_MESSAGE_NO LIKE '%${systemMessageNo}%'
+      </if>
+      <if test="systemMessageName != null and systemMessageName != ''">
+        and SYSTEM_MESSAGE_NAME LIKE '%${systemMessageName}%'
+      </if>
+      <if test="systemMessageContent != null and systemMessageContent != ''">
+        and SYSTEM_MESSAGE_CONTENT LIKE '%${systemMessageContent}%'
+      </if>
+      <if test="vaildFlag != null and vaildFlag != ''">
+        and VAILD_FLAG LIKE '%${vaildFlag}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="isRead != null and isRead != ''">
+        and IS_READ LIKE '%${isRead}%'
+      </if>
+    </where>
+    order by create_time desc
+  </select>
+
+  <select id="getNews"  resultMap="BaseResultMap">
+    <include refid="select"/>
+    where valid_flag = 1
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/service/IMeterBaseSystemMessageService.java

@@ -1,10 +1,15 @@
 package com.steerinfo.baseinfo.meterbasesystemmessage.service;
 
+import cn.hutool.db.Page;
 import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseSystemMessage服务接口：
@@ -21,4 +26,6 @@ import java.math.BigDecimal;
  */
 public interface IMeterBaseSystemMessageService extends IBaseService<MeterBaseSystemMessage, String>{
     String checkandadd(MeterBaseSystemMessage model);
+    PageList<MeterBaseSystemMessage> likeDesc(HashMap params, Integer pageNum, Integer pageSize);
+    MeterBaseSystemMessage getNews();
 }

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/service/impl/MeterBaseSystemMessageServiceImpl.java

@@ -6,13 +6,19 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasesystemmessage.model.MeterBaseSystemMessage;
 import com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessageMapper;
 import com.steerinfo.baseinfo.meterbasesystemmessage.service.IMeterBaseSystemMessageService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseSystemMessage服务实现：
@@ -30,7 +36,7 @@ import java.math.BigDecimal;
 @Service(value = "meterBaseSystemMessageService")
 public class MeterBaseSystemMessageServiceImpl extends BaseServiceImpl<MeterBaseSystemMessage, String> implements IMeterBaseSystemMessageService {
 
-    @Autowired
+    @Resource
     private MeterBaseSystemMessageMapper meterBaseSystemMessageMapper;
 
     @Override
@@ -53,4 +59,18 @@ public class MeterBaseSystemMessageServiceImpl extends BaseServiceImpl<MeterBase
         meterBaseSystemMessageMapper.insert(model);
         return "";
     }
+
+    @Override
+    public PageList<MeterBaseSystemMessage> likeDesc(HashMap params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseSystemMessage> rows = meterBaseSystemMessageMapper.likeDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterBaseSystemMessage getNews() {
+        List<MeterBaseSystemMessage> rows = meterBaseSystemMessageMapper.getNews();
+        return rows.get(0);
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -3399,6 +3399,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1){
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！！！";
             }
+            /*
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
@@ -3410,6 +3411,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     hours <= 4) {
                 return "委托信息不符合混装委托规则，请确认!!";
             }
+             */
+
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";
@@ -3590,6 +3593,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！";
             }
+            /*
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
@@ -3603,6 +3607,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     minutes <= 10) {
                 return "委托信息不符合混卸委托规则，请确认!!";
             }
+             */
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -35,6 +37,18 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         RESTfulResult rm = success();
         try {
             PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            Date dateStart = sdf.parse(params.get("startTime").toString());
+            Date dateEnd = sdf. parse(params.get("endTime").toString());
+            long diff = (dateEnd.getTime() - dateStart.getTime())/(24*60*60*1000);
+            //不可以查询查过两天的新老系统内联合数据
+            if(diff > 2) {
+                rm.setFailed();
+                rm.setMessage("不可以查询超过两天的数据");
+                rm.setData(null);
+                rm.setCode("500");
+                return rm;
+            }
             List<HashMap> oldAndNewList = meterWorkCarActualMapper.selectOldAndNew(params);
             PageList pageInfo = new PageList(oldAndNewList);
             rm.setCode("200");

src/main/java/com/steerinfo/util/SSOUtil.java

@@ -162,7 +162,6 @@ public class SSOUtil {
             JSONObject tempObject = JSONObject.parseObject(tempData);
             accessToken = tempObject.get("accessToken").toString();
         }
-
         return accessToken;
     }