add fun

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/controller/DeviceController.java

@@ -35,7 +35,8 @@ public class DeviceController {
     @RequestMapping(name = "设备删除", value = "/dels", method = RequestMethod.GET)
     public HttpResult dels(@RequestParam("ids") @NotBlank(message = "设备id不能为空") String ids) {
         log.info("设备删除 delete param:{}", ids);
-        return deviceService.dels(ids);
+        return deviceService.dels(ids
+        );
     }
 
     @Log(description = "所属设备查询")

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsDeviceModelPartMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.slope.detection.model.dos.mysql.KwsDeviceModelPart;
 import com.sckw.slope.detection.model.dto.DeviceElementDTO;
+import com.sckw.slope.detection.model.vo.DevicePartModelVo;
+import com.sckw.slope.detection.model.vo.DeviceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,6 +22,9 @@ public interface KwsDeviceModelPartMapper extends BaseMapper<KwsDeviceModelPart>
 
     KwsDeviceModelPart selectByPrimaryKey(Long id);
 
+    List<DevicePartModelVo> selectByModelId(Long deviceModelId);
+
+
     int updateByPrimaryKeySelective(KwsDeviceModelPart record);
 
     int updateByPrimaryKey(KwsDeviceModelPart record);

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsDeviceRelationMapper.java

@@ -3,8 +3,11 @@ package com.sckw.slope.detection.dao.mysql;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.slope.detection.model.dos.mysql.KwsDeviceRelation;
+import com.sckw.slope.detection.model.vo.IntegrationItemVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("mysql")
 public interface KwsDeviceRelationMapper extends BaseMapper<KwsDeviceRelation> {
@@ -19,4 +22,6 @@ public interface KwsDeviceRelationMapper extends BaseMapper<KwsDeviceRelation> {
     int updateByPrimaryKeySelective(KwsDeviceRelation record);
 
     int updateByPrimaryKey(KwsDeviceRelation record);
+
+
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsIntegrationMapper.java

@@ -3,8 +3,11 @@ package com.sckw.slope.detection.dao.mysql;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.slope.detection.model.dos.mysql.KwsIntegration;
+import com.sckw.slope.detection.model.vo.IntegrationItemVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 @DS("mysql")
 public interface KwsIntegrationMapper extends BaseMapper<KwsIntegration> {
@@ -19,4 +22,6 @@ public interface KwsIntegrationMapper extends BaseMapper<KwsIntegration> {
     int updateByPrimaryKeySelective(KwsIntegration record);
 
     int updateByPrimaryKey(KwsIntegration record);
+
+    List<IntegrationItemVO> getDataByFindInSet(String partNames);
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDevice.java

@@ -48,7 +48,7 @@ public class KwsDevice implements Serializable {
     /**
      * 质保日期
      */
-    private DateTime validTime;
+    private Date validTime;
 
     /**
      * 秘钥

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDeviceModelPart.java

@@ -2,6 +2,7 @@ package com.sckw.slope.detection.model.dos.mysql;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.Date;
  * @description 设备-要素关联表
  * @date 2023-10-25 13:46:12
  */
+@Data
 @TableName("kws_device_model_part")
 public class KwsDeviceModelPart implements Serializable {
     private Long id;

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDeviceRelation.java

@@ -21,6 +21,11 @@ public class KwsDeviceRelation implements Serializable {
      */
     private Long deviceId;
 
+    /**
+     * 企业id
+     */
+    private String mountainId;
+
     /**
      * 企业id
      */

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/DeviceModelVo.java

@@ -2,11 +2,14 @@ package com.sckw.slope.detection.model.vo;
 
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.sckw.slope.detection.model.dto.SystemDict;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author sky
@@ -77,6 +80,26 @@ public class DeviceModelVo implements Serializable {
      */
     private DateTime create_time;
 
+    /**
+     * 要素
+     */
+    private List<String> part;
+
+    /**
+     * 集成要素
+     */
+    private List<IntegrationItemVO> integration;
+
+    /**
+     * 数据字典
+     */
+    private List<SystemDict>  systemDict;
+
+    /**
+     * 要素id
+     */
+    private List<String> partId;
+
 
     private static final long serialVersionUID = 1L;
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/DevicePartModelVo.java

@@ -0,0 +1,50 @@
+package com.sckw.slope.detection.model.vo;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author sky
+ * @description vo
+ * @date 2023-10-30 13:10:38
+ */
+@Data
+public class DevicePartModelVo implements Serializable {
+    private Long id;
+
+    /**
+     * 矿山id
+     */
+    private Integer mountainId;
+
+    /**
+     * 设备型号id
+     */
+    private Long deviceModelId;
+
+    /**
+     * 要素名
+     */
+    private String partName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    private Integer createBy;
+
+    private Integer createTime;
+
+    private Integer updateBy;
+
+    private Integer updateTime;
+
+    private Integer delFlag;
+
+
+
+    private static final long serialVersionUID = 1L;
+}

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/DeviceVo.java

@@ -1,6 +1,7 @@
 package com.sckw.slope.detection.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -44,6 +45,7 @@ public class DeviceVo implements Serializable {
     /**
      * 质保日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date validTime;
 
     /**

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/IntegrationItemVO.java

@@ -20,4 +20,19 @@ public class IntegrationItemVO implements Serializable {
      * 集成要素名
      */
     private String integrationName;
+
+    /**
+     * 集成要素id
+     */
+    private String Id;
+
+    /**
+     * 要素名称字符串
+     */
+    private String partNames;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/CommonService.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.NumberConstant;
+import com.sckw.core.model.enums.DictEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.PhpResult;
 import com.sckw.slope.detection.dao.mysql.KwsDictMapper;
@@ -18,11 +19,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author lfdc
@@ -86,4 +85,6 @@ public class CommonService {
         }
         return map;
     }
+
+
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceModelService.java

@@ -1,5 +1,6 @@
 package com.sckw.slope.detection.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
@@ -7,20 +8,22 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.DeviceEnum;
+import com.sckw.core.model.enums.DictEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.slope.detection.dao.mysql.KwsDeviceModelMapper;
-import com.sckw.slope.detection.model.dos.mysql.KwsDevice;
-import com.sckw.slope.detection.model.dos.mysql.KwsDeviceModel;
-import com.sckw.slope.detection.model.dos.mysql.KwsProjectArea;
-import com.sckw.slope.detection.model.dos.mysql.KwsProjectDevice;
+import com.sckw.slope.detection.dao.mysql.KwsDeviceModelPartMapper;
+import com.sckw.slope.detection.dao.mysql.KwsIntegrationMapper;
+import com.sckw.slope.detection.model.dos.mysql.*;
 import com.sckw.slope.detection.model.dto.HeaderData;
 import com.sckw.slope.detection.model.param.DeviceModelAdd;
 import com.sckw.slope.detection.model.param.DeviceModelQuery;
 import com.sckw.slope.detection.model.vo.DeviceModelVo;
-import com.sckw.slope.detection.model.vo.DeviceVo;
-import com.sckw.slope.detection.model.vo.ProjectVo;
+import com.sckw.slope.detection.model.dos.mysql.KwsDeviceModelPart;
+import com.sckw.slope.detection.model.dto.SystemDict;
+import com.sckw.slope.detection.model.vo.DevicePartModelVo;
+import com.sckw.slope.detection.model.vo.IntegrationItemVO;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
@@ -31,8 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author sky
@@ -49,6 +51,12 @@ public class DeviceModelService {
     @Autowired
     KwsDeviceModelMapper kwsDeviceModelMapper;
 
+    @Autowired
+    KwsDeviceModelPartMapper kwsDeviceModelPartMapper;
+
+    @Autowired
+    KwsIntegrationMapper kwsIntegrationMapper;
+
     /**
      * 项目管理分页查询
      *
@@ -100,7 +108,41 @@ public class DeviceModelService {
         DeviceModelVo vo = new DeviceModelVo();
         BeanUtils.copyProperties(device, vo);
         vo.setStatusText(DeviceEnum.getName(vo.getStatus()));
-
+        //获取要数
+        List<DevicePartModelVo> deviceModelPart= kwsDeviceModelPartMapper.selectByModelId(vo.getId());
+        //获取字典
+        Map<String, SystemDict> dictList = commonService.getDictList(null, new HashMap<String, String>() {{
+            put("code", DictEnum.MODEL_PART.getCodeType());
+            put("type", "1");
+        }});
+        //获取集成要素-start
+        List<String> partData = new ArrayList<>();
+        List<String> intList = new ArrayList<>();
+        //Map<String,IntegrationItemVO> map = new HashMap<>();
+        List<IntegrationItemVO> dataList = new ArrayList<>();
+        for (DevicePartModelVo part : deviceModelPart) {
+            for(SystemDict value : dictList.values()){
+                if(part.getPartName().equals(value.getValue())){
+                    partData.add(value.getLabel());
+                    //查询对应的集成要素
+                    List<IntegrationItemVO> integrationItemVO = kwsIntegrationMapper.getDataByFindInSet(value.getValue());
+                    for (IntegrationItemVO intvo : integrationItemVO) {
+                        if(!intList.contains(intvo.getId())){//判断是否存在
+                            intList.add(intvo.getId());
+                            dataList.add(intvo);
+                        }
+                    }
+                }
+            }
+        }
+        //获取集成要素-end
+        List<SystemDict> systemDict = new ArrayList<>();
+        for(SystemDict value : dictList.values()){
+            systemDict.add((value));
+        }
+        vo.setPart(partData);
+        vo.setIntegration(dataList);
+        vo.setSystemDict(systemDict);
         return HttpResult.ok(vo);
     }
 

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -1,5 +1,6 @@
 package com.sckw.slope.detection.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
@@ -152,6 +153,7 @@ public class DeviceService {
         device.setUpdateTime(now);
         device.setMountainId(headerData.getCompanyId());
         deviceMapper.insert(device);
+        //log.info("设备新增 add param:{}", JSONObject.toJSONString(a));
         return HttpResult.ok();
     }
 

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -52,7 +52,6 @@
                left join kws_project as p on pd.project_id = p.id
       WHERE d.del_flag = 0
         and m.del_flag = 0
-      <where>
           <if test="deviceQuery.name != null and deviceQuery.name != ''">
               and name like concat('%', #{deviceQuery.name}
                    , '%')
@@ -63,7 +62,6 @@
           <if test="deviceQuery.attribute != null and deviceQuery.attribute != ''">
               and attribute = #{deviceQuery.attribute,jdbcType=TINYINT}
           </if>
-      </where>
   </select>
   <insert id="insert" parameterType="com.sckw.slope.detection.model.dos.mysql.KwsDevice">
     <!--@mbg.generated-->
@@ -72,13 +70,13 @@
       valid_time, secret_key, inter_face,
       remark, `status`, create_by, 
       create_time, update_by, update_time, 
-      del_flag,related)
+      del_flag,related,mountain_id)
     values (#{id,jdbcType=BIGINT}, #{attribute,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
       #{alias,jdbcType=VARCHAR}, #{snCode,jdbcType=VARCHAR}, #{modelId,jdbcType=BIGINT}, 
       #{validTime,jdbcType=TIMESTAMP}, #{secretKey,jdbcType=VARCHAR}, #{interFace,jdbcType=VARCHAR},
       #{remark,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{createBy,jdbcType=BIGINT}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{delFlag,jdbcType=TINYINT},#{related,jdbcType=BIGINT})
+      #{delFlag,jdbcType=TINYINT},#{related,jdbcType=BIGINT},#{mountainId,jdbcType=VARCHAR})
   </insert>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceModelPartMapper.xml

@@ -21,11 +21,22 @@
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
     from kws_device_model_part
     where id = #{id,jdbcType=BIGINT}
   </select>
+    <select id="selectByModelId" parameterType="java.lang.Long" resultType="com.sckw.slope.detection.model.vo.DevicePartModelVo">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List" />
+        from kws_device_model_part
+        where del_flag=0
+        <if test="deviceModelId != null">
+            and device_model_id = #{deviceModelId,jdbcType=BIGINT}
+        </if>
+        order by part_name
+    </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from kws_device_model_part
@@ -209,4 +220,5 @@
       and a.mountain_id = #{mountainId}
       and a.project_id = #{projectId}
     </select>
+
 </mapper>

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceRelationMapper.xml

@@ -27,6 +27,7 @@
     from kws_device_relation
     where id = #{id,jdbcType=BIGINT}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from kws_device_relation

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsIntegrationMapper.xml

@@ -12,7 +12,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
-      <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+      <result column="mountain_id" jdbcType="VARCHAR" property="mountainId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="BIGINT" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -21,7 +21,7 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, integration_name, part_names, unit, formula, remark, `status`, create_by, create_time, 
-    update_by, update_time, del_flag,company_id
+    update_by, update_time, del_flag,mountain_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -30,6 +30,13 @@
     from kws_integration
     where id = #{id,jdbcType=BIGINT}
   </select>
+  <select id="getDataByFindInSet" resultType="com.sckw.slope.detection.model.vo.IntegrationItemVO">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from kws_integration
+    where FIND_IN_SET(#{partNames,jdbcType=VARCHAR},part_names)
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from kws_integration