Merge remote-tracking branch 'origin/master'

delivery-framework/delivery-spring-boot-starter-mybatis/src/main/java/com/unis/framework/mybatis/core/type/JsonStringListTypeHandler.java

@@ -0,0 +1,23 @@
+package com.unis.framework.mybatis.core.type;
+
+import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.unis.framework.common.util.json.JsonUtils;
+
+import java.util.List;
+
+public class JsonStringListTypeHandler  extends AbstractJsonTypeHandler<Object> {
+
+    private static final TypeReference<List<String>> TYPE_REFERENCE = new TypeReference<List<String>>(){};
+    private static final String COMMA = ",";
+    @Override
+    protected Object parse(String json) {
+        return JsonUtils.parseObject(json, TYPE_REFERENCE);
+    }
+
+    @Override
+    protected String toJson(Object obj) {
+        return JsonUtils.toJsonString(obj);
+    }
+
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/CrkxxController.java

@@ -68,9 +68,7 @@ public class CrkxxController {
     @PreAuthorize("@ss.hasPermission('delivery:crkxx:query')")
     public CommonResult<CrkxxRespVO> getCrkxx(@RequestParam("id") Long id) {
         CrkxxDO crkxx = crkxxService.getCrkxx(id);
-        List<String> list = KQBMUtils.strToList(crkxx.getFileIds());
         CrkxxRespVO respVO = BeanUtils.toBean(crkxx, CrkxxRespVO.class);
-        respVO.setFileIds(list);
         return success(respVO);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxRespVO.java

@@ -2,11 +2,15 @@ package com.unis.module.coding.controller.admin.crkxx.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import java.util.*;
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+
 import com.alibaba.excel.annotation.*;
 import com.unis.framework.excel.core.annotations.DictFormat;
 import com.unis.framework.excel.core.convert.DictConvert;
@@ -43,7 +47,7 @@ public class CrkxxRespVO {
 
     @Schema(description = "附件多个逗号隔开','(INFRA_FILE.ID)")
     @ExcelProperty("附件多个逗号隔开','(INFRA_FILE.ID)")
-    private List fileIds;
+    private String fileIds;
 
     @Schema(description = "承运人")
     @ExcelProperty("承运人")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/vo/DwxxSaveReqVO.java

@@ -52,7 +52,7 @@ public class DwxxSaveReqVO {
     private BigDecimal wd;
 
     @Schema(description = "上传营业执照", example = "11527")
-    private Set<String> resid;
+    private String resid;
 
     @Schema(description = "上报状态	0、未上报   1、已上报 ")
     private Integer sbzt;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kqxx/vo/KqxxSaveReqVO.java

@@ -56,7 +56,7 @@ public class KqxxSaveReqVO {
     private Integer wtbgckj;
 
     @Schema(description = "上传库区图id", example = "20479")
-    private Set<String> resid;
+    private String resid;
 
     @Schema(description = "上报状态 0、未上报   1、已上报")
     private Integer sbzt;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/lqjcxx/LqjcxxController.java

@@ -68,9 +68,9 @@ public class LqjcxxController {
     public CommonResult<LqjcxxRespVO> getLqjcxxByCfId(@RequestParam("cfId") Long cfId) {
         LqjcxxDO lqjcxx = lqjcxxService.getLqjcxxByCfId(cfId);
         //粮情检测图片 str->list
-        List<String> list = KQBMUtils.strToList(lqjcxx.getFileIds());
+//        List<String> list = KQBMUtils.strToList(lqjcxx.getFileIds());
         LqjcxxRespVO lqjcxxRespVO = BeanUtils.toBean(lqjcxx, LqjcxxRespVO.class);
-        lqjcxxRespVO.setFileIds(list);
+//        lqjcxxRespVO.setFileIds(list);
         return success(lqjcxxRespVO);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxRespVO.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "APP - 打卡信息 Response VO")
 @Data
@@ -30,6 +31,6 @@ public class TaskDkxxRespVO {
     private String dkdd;
 
     @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
-    private String pzxx;
+    private List<Long> pzxx;
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxSaveVO.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "APP - 打卡信息 Response VO")
 @Data
@@ -28,7 +29,7 @@ public class TaskDkxxSaveVO {
     private String dkdd;
 
     @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
-    private String pzxx;
+    private List<Long> pzxx;
 
     @Schema(description = "打卡类型:1:省核验人,2:银行核验人")
     private Integer dkType;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/ZjxxController.java

@@ -70,9 +70,7 @@ public class ZjxxController {
     public CommonResult<ZjxxRespVO> getZjxx(@RequestParam("id") Long id) {
         ZjxxDO zjxx = zjxxService.getZjxx(id);
         //质检信息的图片字符转-》list
-        List<String> list = KQBMUtils.strToList(zjxx.getFileIds());
         ZjxxRespVO zjxxRespVO = BeanUtils.toBean(zjxx, ZjxxRespVO.class);
-        zjxxRespVO.setFileIds(list);
         return success(zjxxRespVO);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/crkxx/CrkxxDO.java

@@ -1,15 +1,18 @@
 package com.unis.module.coding.dal.dataobject.crkxx;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
+import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import com.unis.framework.mybatis.core.type.StringListTypeHandler;
 import lombok.*;
-import java.util.*;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 出入库信息 DO
@@ -37,7 +40,7 @@ public class CrkxxDO extends BaseDO {
     private String lspzmc;
     /**
      * 粮食等级编码(SYSTEM_DICT_DATA.LABEL)
-     *
+     * <p>
      * 枚举 {@link TODO system_lsdj 对应的类}
      */
     private String lsdjbm;
@@ -56,6 +59,7 @@ public class CrkxxDO extends BaseDO {
     /**
      * 附件多个逗号隔开','(INFRA_FILE.ID)
      */
+//    @TableField(value = "FILE_IDS", typeHandler = StringListTypeHandler.class)
     private String fileIds;
     /**
      * 承运人

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/dk/DkDO.java

@@ -1,19 +1,23 @@
 package com.unis.module.coding.dal.dataobject.dk;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import com.unis.framework.mybatis.core.type.LongListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 打卡信息 DO
  *
  * @author 超级管理员
  */
-@TableName("delivery_dk")
+@TableName(value = "delivery_dk",autoResultMap = true)
 @KeySequence("delivery_dk_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -47,7 +51,9 @@ public class DkDO extends BaseDO {
     /**
      * 拍照信息多个逗号分隔','(INFRA_FILE.ID)
      */
-    private String pzxx;
+    @TableField(typeHandler = LongListTypeHandler.class)
+    @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
+    private List<Long> pzxx;
     /** 打卡类型:1:省核验人,2:银行核验人 */
     private Integer dkType;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/spxx/SpxxDO.java

@@ -52,5 +52,24 @@ public class SpxxDO {
      * 是否在线
      */
     private Integer sfzx;
+    /**
+     * 监控点类型
+     */
+    private Integer jkdlx;
+    /**
+     * 所属区域路径
+     */
+    private String ssqylj;
+    /**
+     * 区域路径名称
+     */
+    private String qyljmc;
+    /**
+     * 所属区域路径名称
+     */
+    private String ssqyljmc;
+
+
+
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/crkxx/CrkxxServiceImpl.java

@@ -47,13 +47,12 @@ public class CrkxxServiceImpl implements CrkxxService {
     public Long createCrkxx(CrkxxSaveReqVO createReqVO) {
         CrkxxDO crkxx = BeanUtils.toBean(createReqVO, CrkxxDO.class);
         //列表转成字符串用逗号隔开
-        String s = KQBMUtils.listToStr(createReqVO.getFileIds());
-        crkxx.setFileIds(s);
+        String setString = createReqVO.getFileIds().toString();
         //插入和更新
         if (ObjectUtil.isEmpty(createReqVO.getId())) {
             // 插入前查询一下是否有hwkId
             List<HwkDO> hwks = hwkMapper.selectList(new QueryWrapper<HwkDO>().eq("CF_ID", createReqVO.getCfId()));
-            if(CollectionUtil.isNotEmpty(hwks)){
+            if (CollectionUtil.isNotEmpty(hwks)) {
                 //将已经存在的货位卡id放进去
                 crkxx.setHwkId(hwks.get(0).getId());
             }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -113,18 +113,9 @@ public class DwxxServiceImpl implements DwxxService {
 
     @Override
     public Long createDwxx(DwxxSaveReqVO createReqVO) {
-        String redis = "";
-        for (String red : createReqVO.getResid()) {
-            if (StringUtils.isEmpty(redis)) {
-                redis = red;
-            } else {
-                redis += "," + red;
-            }
-        }
 
         // 插入
         DwxxDO dwxx = BeanUtils.toBean(createReqVO, DwxxDO.class);
-        dwxx.setResid(redis);
         dwxx.setId(YitIdHelper.nextId());
         /**
          * {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kqxx/KqxxServiceImpl.java

@@ -39,17 +39,8 @@ public class KqxxServiceImpl implements KqxxService {
 
     @Override
     public Long createKqxx(KqxxSaveReqVO createReqVO) {
-        String redis = "";
-        for (String red : createReqVO.getResid()) {
-            if (StringUtils.isEmpty(redis)) {
-                redis = red;
-            } else {
-                redis += "," + red;
-            }
-        }
         // 插入
         KqxxDO kqxx = BeanUtils.toBean(createReqVO, KqxxDO.class);
-        kqxx.setResid(redis);
         kqxx.setId(YitIdHelper.nextId());
         kqxx.setSjly(0);
         kqxxMapper.insert(kqxx);

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -18,10 +18,10 @@
             COUNT(distinct dc.ID) AS HY_NUM
         FROM
             ${pageReqVO.tableName} dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
         WHERE
-            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0
+            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
         <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
             AND dk.SHENG = #{pageReqVO.sheng}
         </if>
@@ -62,9 +62,9 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_USERS du
+        LEFT JOIN DELIVERY_CAXX dc ON du.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON du.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
-        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0
+        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0 AND dc.DELETED = 0
             <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
                 AND dk.SHENG = #{pageReqVO.sheng}
             </if>
@@ -96,8 +96,8 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_BANK dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID AND du.DELETED = 0
         WHERE
         dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
@@ -145,7 +145,7 @@
         FROM
             DELIVERY_KQXX dk
         LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
-        left join DELIVERY_BANK db on dk.ID = db.KQ_ID and db.deleted = 0
+        left join DELIVERY_BANK db on DC.ID = db.CA_ID and db.deleted = 0
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID and du.deleted = 0
         WHERE
             dk.DELETED =0 AND dc.DELETED = 0 AND dk.SFZX = 0

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -35,7 +35,7 @@
     </select>
 
     <select id="selectSpList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
-        select jkdbm,jkdmc,url from DELIVERY_SPXX;
+        select jkdbm,jkdmc,url from DELIVERY_SPXX
         <where>
             <if test="kqdm!= null and kqdm!= ''">
                 and kqdm = #{kqdm}