自助注册修改、新老系统联合查询、一次、统计

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

@@ -868,7 +868,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
             List<MeterBaseCar> list = meterBaseCarService.query(query);
             if (list.size() == 0) {
                 // sso注册
-                params.put("password", "jg123456");
+                params.put("password", "a1234567");
                 SSOUtil ssoUtil = new SSOUtil();
                 HashMap ssoMap = ssoUtil.ssoRegister(params);
 
@@ -893,6 +893,10 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     }else if(ssoMap.get("code").equals("0")) {
                         car.setSsoId(ssoMap.get("data").toString());
                     }
+                    if (car.getSsoId() != null) {
+                        // SSO重置密码
+                        ssoUtil.ssoResetPwd(car.getSsoId(), "123456", "");
+                    }
                     msg = meterBaseCarService.checkandadd(car);
                 }
             } else {
@@ -910,7 +914,11 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 if (car.getSsoId() != null) {
                     // SSO重置密码
                     SSOUtil ssoUtil = new SSOUtil();
-                    msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(), "");
+                    if (car.getSsoId() != null && car.getCarTypeNo().equals("001004003")) {
+                        // SSO重置密码
+                        ssoUtil.ssoResetPwd(car.getSsoId(), "123456", "");
+                    }
+//                    msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(), "");
                 }
                 meterBaseCarMapper.updateByPrimaryKeySelective(car);
             }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java

@@ -59,4 +59,6 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<MeterWorkCarActual> selectByMap(Map<String, Object> params);
 
     List<HashMap> selectOldAndNew(Map<String, Object> params);
+    List<HashMap> doQueryFirstOldAndNew(Map<String, Object> params);
+    List<HashMap> countOldAndNew(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3899,7 +3899,9 @@
   <select id="selectOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
     SELECT *
        FROM (
-    select ACTUAL_NO,CAR_NO,
+    select ACTUAL_NO,
+           prediction_no,
+           CAR_NO,
            GROSS_WEIGHT,
            BASE_SPOT1_NAME,
            GROSS_TIME,
@@ -3907,18 +3909,26 @@
            BASE_SPOT2_NAME,
            TARE_TIME,
            NET_WEIGHT,
+           net_spot3_no,
            NET_SPOT3_NAME,
            NET_TIME,
+           forwarding_unit_no,
            FORWARDING_UNIT_NAME,
+           receiving_uint_no,
            RECEIVING_UINT_NAME,
+           matter_no,
            MATTER_NAME,
-           '新系统' REMARK from METER_WORK_CAR_ACTUAL
+           sender_remark,
+           '新系统' as REMARK
+           from METER_WORK_CAR_ACTUAL
      where IS_PRE_SCALE='1'
-           and VALUE_FLAG='1'
+           and VALUE_FLAG in ('1', '2')
            and UPLOAD_FLAG='2'
-           and NET_TIME > to_date('2022-01-01'，'YYYY-MM-DD')
+           and NET_TIME > to_date('2022-07-21'，'YYYY-MM-DD')
            union
-               select FS_WEIGHTNO as ACTUAL_NO,REPLACE(FS_CARNO,'-','') as CAR_NO,
+               select FS_WEIGHTNO as ACTUAL_NO,
+                      fs_noticeId as prediction_no,
+                      REPLACE(FS_CARNO,'-','') as CAR_NO,
                       FS_GROSSWEIGHT * 1000 as GROSS_WEIGHT,
                       FS_GROSSPOINTNAME as BASE_SPOT1_NAME,
                       FS_GROSSWEIGHTTIME as GROSS_TIME,
@@ -3926,21 +3936,210 @@
                       FS_TAREPOINTNAME as BASE_SPOT2_NAME,
                       FS_TAREWEIGHTTIME as TARE_TIME,
                       FS_NETWEIGHT * 1000 as NET_WEIGHT,
+                      fs_netPointId as net_spot3_no,
                       FS_NETPOINTNAME as NET_SPOT3_NAME,
                       FS_NETWEIGHTTIME as NET_TIME,
+                      fs_sender as FORWARDING_UNIT_No,
                       FS_SENDERNAME as FORWARDING_UNIT_NAME,
+                      fs_receiver as RECEIVING_UINT_No,
                       FS_RECEIVERNAME as RECEIVING_UINT_NAME,
+                      fs_material as matter_no,
                       FS_MATERIALNAME as MATTER_NAME,
-                      '老系统' REMARK
+                      fs_senderRemark sender_remark,
+                      '老系统' as REMARK
                 from jgweight.view_car_net @MCMS
-                   where FS_NETWEIGHTTIME > to_date('2022-01-01'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
-             ) A
-     where 1 = 1
+                   where FS_NETWEIGHTTIME > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+             )
+        where 1 = 1
+          <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+          </if>
+          <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+          </if>
+          <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+          </if>
+          <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+          </if>
+          <if test="carNo != null and carNo != ''">
+            and car_no like '%${carNo}%'
+          </if>
+          <if test="netSpot3No != null and netSpot3No != ''">
+            and net_spot3_no like '%${netSpot3No}%'
+          </if>
+          <if test="netSpot3Name != null and netSpot3Name != ''">
+            and net_spot3_name like '%${netSpot3Name}%'
+          </if>
+          <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+          </if>
+          <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+          </if>
+          <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+          </if>
+          <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+          </if>
+          <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+          </if>
+          <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+          </if>
+  </select>
+
+  <select id="doQueryFirstOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
+    select *
+        from (
+            select actual_first_no,
+            prediction_no,
+            car_no,
+            meter_weight,
+            create_time,
+            base_spot_no,
+            base_spot_name,
+            forwarding_unit_no,
+            forwarding_unit_name,
+            receiving_uint_no,
+            receiving_uint_name,
+            matter_no,
+            matter_name,
+            sender_remark,
+            '新系统' remark
+            from meter_work_car_actual_first
+        where is_pre_scale = '1'
+            and value_flag in  ('1', '2')
+            and create_time > to_date('2022-07-21'，'YYYY-MM-DD')
+            union
+              (
+                  select weightNo actual_first_no,
+                  noticeId prediction_no,
+                  replace(carNo, '-', '') car_no,
+                  weight*1000 meter_weight,
+                  weightTime create_time,
+                  fs_pointId base_spot_no,
+                  pointName base_spot_name,
+                  sender forwarding_unit_no,
+                  senderName forwarding_unit_name,
+                  receiver receiving_uint_no,
+                  receiverName receiving_uint_name,
+                  material matter_no,
+                  materialName matter_name,
+                  senderRemark sender_remark,
+                  '老系统' remark
+                  from jgweight.VIEW_CAR_FIRST @MCMS
+            where weightTime > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N')
+            ) A
+        where 1 = 1
+          <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+          </if>
+          <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+          </if>
+          <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+          </if>
+          <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+          </if>
+          <if test="carNo != null and carNo != ''">
+            and car_no like '%${carNo}%'
+          </if>
+          <if test="baseSpotNo != null and baseSpotNo != ''">
+            and base_spot_no like '%${baseSpotNo}%'
+          </if>
+          <if test="baseSpotName != null and baseSpotName != ''">
+            and base_spot_name like '%${baseSpotName}%'
+          </if>
+          <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+          </if>
+          <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+          </if>
+          <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+          </if>
+          <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+          </if>
+          <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+          </if>
+          <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+          </if>
+  </select>
+  <select id="countOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
+    select * from
+    (
+    select matter_no,
+    matter_name,
+    count(1) countSum,
+    sum(net_weight) net_weight,
+    sum(gross_weight) gross_weight,
+    sum(tare_weight) tare_weight,
+    forwarding_unit_no,
+    forwarding_unit_name,
+    receiving_uint_no,
+    receiving_uint_name,
+    '新系统' remark
+    from meter_work_car_actual
+    where 1= 1
+        and IS_PRE_SCALE='1'
+        and VALUE_FLAG in ('1', '2')
+        and UPLOAD_FLAG='2'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-          and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-        <if test="carNo != null and carNo != ''">
-          and car_no like '%${carNo}%'
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
+    group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
+    union
+        (
+        select fs_material matter_no,
+        fs_materialName matter_name,
+        count(1) countSum,
+        sum(fs_netWeight*1000) net_weight,
+        sum(fs_grossWeight*1000) gross_weight,
+        sum(fs_tareWeight*1000) tare_weight,
+        fs_sender forwarding_unit_no,
+        fs_senderName forwarding_unit_name,
+        fs_receiver receiving_uint_no,
+        fs_receiverName receiving_uint_name,
+        '老系统' remark
+        from jgweight.view_car_net @MCMS
+        where 1 = 1
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+              and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            </if>
+        group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
+        )
+    )
+    where 1=1
+    <if test="remark != null and remark != ''">
+      and remark LIKE '%${remark}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and matter_no LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and matter_name LIKE '%${matterName}%'
+    </if>
   </select>
 </mapper>

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

@@ -1,18 +1,10 @@
 package com.steerinfo.meterwork.meterworkoldandnew.controller;
 
-
-import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
-import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
-import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,9 +23,9 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     @Resource
     MeterWorkCarActualMapper meterWorkCarActualMapper;
 
-    @ApiOperation(value="查询老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询洁净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/doQueryOldAndNew")
-    public RESTfulResult HasPermissionGivenByJL(@RequestBody HashMap params) {
+    public RESTfulResult doQueryOldAndNew(@RequestBody HashMap params) {
         RESTfulResult rm = success();
         try {
             PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
@@ -61,4 +53,65 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value="查询一次老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/doQueryFirstOldAndNew")
+    public RESTfulResult doQueryFirstOldAndNew(@RequestBody HashMap params) {
+        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.doQueryFirstOldAndNew(params);
+            PageList pageInfo = new PageList(oldAndNewList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+
+    @ApiOperation(value="统计洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/countOldAndNew")
+    public RESTfulResult countOldAndNew(@RequestBody HashMap params) {
+        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.countOldAndNew(params);
+            PageList pageInfo = new PageList(oldAndNewList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
 }