add

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -167,4 +167,8 @@ public interface PublicService {
     Boolean getCppjly(String pjly);
     String getAppraiseStatusT(String pjly);
     String getSpmessage(OrderBase orderBase, String spmessage);
+
+    void setKjmm(ItfTblAzWgmxJyktUpload mxup);
+    void setSyktKjmm(ItfTblAzWgmxSyktUpload mxup);
+    void setQitaKjmm(ItfTblAzWgmxQitaUpload mxup);
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -1590,6 +1590,12 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         orderPar.setBrandId(brand.getBrandId());
         orderPar.setOrderNo(ojtutl.getId());
         ItfTblAzAssignLcLsUpload lcls = gdOrderBaseMapper.getAzOrderBase(orderPar);
+        if (StringUtils.isEmpty(lcls.getDizi())){
+            lcls.setDizi(lcls.getGpsdzxx());
+            if (lcls.getDizi().length()>200){
+                lcls.setDizi(lcls.getDizi().substring(0,200));
+            }
+        }
         lcls.setUploadTaskSynReqId(ojtutl.getSynReqId());
 
         // 创建人及创建人名称改为对应的创建网点

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -1247,6 +1247,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         orderPar.setBrandId(brand.getBrandId());
         orderPar.setOrderNo(ojtutl.getId());
         ItfTblAzAssignLcLsUpload lcls = gdOrderBaseMapper.getAzOrderBase(orderPar);
+        if (StringUtils.isEmpty(lcls.getDizi())){
+            lcls.setDizi(lcls.getGpsdzxx());
+            if (lcls.getDizi().length()>200){
+                lcls.setDizi(lcls.getDizi().substring(0,200));
+            }
+        }
+
         lcls.setUploadTaskSynReqId(ojtutl.getSynReqId());
 
         // 创建人及创建人名称改为对应的创建网点
@@ -1318,6 +1325,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         orderPar.setBrandId(brand.getBrandId());
         orderPar.setOrderNo(orderBase.getId());
         ItfTblAzAssignLcLsUpload lcls = gdOrderBaseMapper.getAzOrderBaseCj(orderPar);
+        if (StringUtils.isEmpty(lcls.getDizi())){
+            lcls.setDizi(lcls.getGpsdzxx());
+            if (lcls.getDizi().length()>200){
+                lcls.setDizi(lcls.getDizi().substring(0,200));
+            }
+        }
         // 网点参数处理
         setWebsit(brand, orderBase, lcls);
         // 省市等信息单独处理 转成格力总部的信息
@@ -2115,9 +2128,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setGmsj(orderBase.getBuyTime());
         mxup.setCjwdno(mxup.getAzwdno());
         mxup.setZjczwd(mxup.getAzwdno());
-
+        // 开机密码处理
+        publicService.setKjmm(mxup);
     }
 
+
     public void setnwjtm(OrderBase orderBase,ItfTblAzWgmxJyktUpload mxup) {
         List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
                 .eq(OrderInstallDetailCode::getOrderDetailId,orderBase.getId())
@@ -2183,6 +2198,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
         }
         mxup.setGmsj(orderBase.getBuyTime());
+        // 开机密码处理
+        publicService.setKjmm(mxup);
     }
 
     public void setOtherParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
@@ -2231,6 +2248,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setGmsj(orderBase.getBuyTime());
         mxup.setCjwdno(mxup.getAzwdno());
         mxup.setZjczwd(mxup.getAzwdno());
+        // 开机密码处理
+        publicService.setQitaKjmm(mxup);
 
     }
 
@@ -2300,6 +2319,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             mxup.setAzrenid(wxg.getWxgid());
         }
 
+        // 开机密码处理
+        publicService.setSyktKjmm(mxup);
     }
 
     public void setSyParm(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
@@ -2348,6 +2369,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         mxup.setGmsj(orderBase.getBuyTime());
         mxup.setCjwdno(mxup.getAzwdno());
         mxup.setZjczwd(mxup.getAzwdno());
+        // 开机密码处理
+        publicService.setSyktKjmm(mxup);
 
         // 网点维修工ID单独处理
         // 先找出网点编号对应的品牌商网点编号

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1881,6 +1881,81 @@ public class PublicServiceImpl implements PublicService {
         return spmessage;
     }
 
+    @Override
+    public void setKjmm(ItfTblAzWgmxJyktUpload mxup) {
+        if (StringUtils.isNotEmpty(mxup.getKjmm())){
+            String s = mxup.getKjmm();
+            String po="";
+            String pt="";
+            List<String> result = new ArrayList<>();
+
+            if (mxup.getKjmm().contains("#")){
+                result = Arrays.asList(mxup.getKjmm().split("#"));
+                po=result.get(0);
+                pt=result.get(1);
+            } else {
+                po = mxup.getKjmm();
+            }
+
+            if (po.length()>22){
+                po=po.substring(0,22);
+            }
+            if (pt.length()>22){
+                pt=pt.substring(0,22);
+            }
+            mxup.setKjmm(po);
+            mxup.setKjmm2(pt);
+        }
+    }
+
+    @Override
+    public void setSyktKjmm(ItfTblAzWgmxSyktUpload mxup){
+        if (StringUtils.isNotEmpty(mxup.getKjmm())){
+            String s = mxup.getKjmm();
+            String po="";
+            List<String> result = new ArrayList<>();
+
+            if (mxup.getKjmm().contains("#")){
+                result = Arrays.asList(mxup.getKjmm().split("#"));
+                po=result.get(0);
+            } else {
+                po = mxup.getKjmm();
+            }
+
+            if (po.length()>22){
+                po=po.substring(0,22);
+            }
+            mxup.setKjmm(po);
+        }
+    }
+
+    @Override
+    public void setQitaKjmm(ItfTblAzWgmxQitaUpload mxup){
+        if (StringUtils.isNotEmpty(mxup.getKjmm())){
+            String s = mxup.getKjmm();
+            String po="";
+            String pt="";
+            List<String> result = new ArrayList<>();
+
+            if (mxup.getKjmm().contains("#")){
+                result = Arrays.asList(mxup.getKjmm().split("#"));
+                po=result.get(0);
+                pt=result.get(1);
+            } else {
+                po = mxup.getKjmm();
+            }
+
+            if (po.length()>22){
+                po=po.substring(0,22);
+            }
+            if (pt.length()>22){
+                pt=pt.substring(0,22);
+            }
+            mxup.setKjmm(po);
+            mxup.setKjmm2(pt);
+        }
+    }
+
     private String getAppraiseStatusr(String pjly) {
         String appraiseStatus = "";
         SatisfactionList sfs = getAppraiseStatus(pjly);

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -1892,7 +1892,12 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         orderPar.setBrandId(brand.getBrandId());
         orderPar.setOrderNo(sourceData.getOrderNo());
         ItfTblAssignUpload itass = gdOrderBaseMapper.getItfTblAssignUpload(orderPar);
-
+        if (StringUtils.isEmpty(itass.getDizi())){
+            itass.setDizi(itass.getGpsdzxx());
+            if (itass.getDizi().length()>100){
+                itass.setDizi(itass.getDizi().substring(0,100));
+            }
+        }
 
         // 信息渠道id 取的是info_channel 有问题
         itass.setUploadTaskSynReqId(taskId);

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -185,6 +185,26 @@ public class test {
         String lastDay = getYearLastDay(new Date());
         System.out.println("指定日期所在年的最后一天为：" + lastDay);
 
+String s="725737 或 854545 或 141251#141251 或 681045 或 471525";
+String po="";
+String pt="";
+List<String> result = new ArrayList<>();
+
+        if (s.contains("#")){
+    result = Arrays.asList(s.split("#"));
+    po=result.get(0);
+    pt=result.get(1);
+}
+        if (po.length()>22){
+            po=po.substring(0,22);
+        }
+        if (pt.length()>22){
+            pt=pt.substring(0,22);
+        }
+        System.out.println(s);
+        System.out.println(po);
+        System.out.println(pt);
+
     }
 
 

src/main/resources/mapper/CodeOrderInstallDetailMapper.xml

@@ -13,8 +13,8 @@
     <select id="getJyCode" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxJyktTmmxUpload">
         select order_base_id as worker_order_no,out_id as fa_order_install_detail_code_id,tmguid, 'guangfo' as created_by,
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,pgwcmxid,
-               code as xjqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,create_time as cjsj,
-               left(password2, 6) as kjmm2, gree_image_id as imgpath
+               code as xjqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 22) as kjmm,create_time as cjsj,
+               left(password2, 22) as kjmm2, gree_image_id as imgpath
         from order_install_detail_code
             where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -24,8 +24,8 @@
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,pgwcmxid,
                code as jqtm,
                case when type = '1' then 2 else 1 end as tmlx,
-               gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,create_time	as cjsj,
-               left(password2, 6) as kjmm2,gree_image_id as imgpath
+               gree_image_id as scwj,gree_image_id as scid,left(password, 22) as kjmm,create_time	as cjsj,
+               left(password2, 22) as kjmm2,gree_image_id as imgpath
         from order_install_detail_code
         where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -33,8 +33,8 @@
     <select id="getOtherCode" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxQitaTmmxUpload">
         select order_base_id as worker_order_no,out_id as fa_order_install_detail_code_id,tmguid,'guangfo' as created_by,
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,
-               pgwcmxid as pgwcmxid,code as jqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,
-               create_time as cjsj,left(password2, 6) as kjmm2,gree_image_id
+               pgwcmxid as pgwcmxid,code as jqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 22) as kjmm,
+               create_time as cjsj,left(password2, 22) as kjmm2,gree_image_id
         from order_install_detail_code
         where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -51,8 +51,8 @@
         select a.order_base_id as worker_order_no,a.out_id as fa_order_install_detail_code_id,a.tmguid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,a.update_time as last_modified_date,b.pgwcmxid,
                a.code as jqtm,case when a.type = '1' then 2 else 1 end as tmlx,
-               a.gree_image_id as scwj,a.gree_image_id as scid,left(a.password, 6) as kjmm,a.create_time	as cjsj,
-               left(a.password2, 6) as kjmm2,a.gree_image_id as imgpath
+               a.gree_image_id as scwj,a.gree_image_id as scid,left(a.password, 22) as kjmm,a.create_time	as cjsj,
+               left(a.password2, 22) as kjmm2,a.gree_image_id as imgpath
         from order_install_detail_code a left join order_install_detail b on a.order_base_id=b.order_base_id and a.order_detail_id=b.id
         where a.order_base_id = #{request.orderNo} and a.id = #{request.id}
     </select>

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -23,7 +23,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
@@ -59,7 +59,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
@@ -96,7 +96,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
@@ -132,7 +132,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
@@ -168,7 +168,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
@@ -204,7 +204,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               a.inside_password as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,