change - 设备参数

aucma-base/src/main/java/com/aucma/base/controller/BaseDeviceLedgerController.java

@@ -46,6 +46,12 @@ public class BaseDeviceLedgerController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/getDeviceLedgerList")
+    public AjaxResult getDeviceLedgerList(BaseDeviceLedger baseDeviceLedger) {
+        List<BaseDeviceLedger> list = baseDeviceLedgerService.selectBaseDeviceLedgerList(baseDeviceLedger);
+        return success(list);
+    }
+
     /**
      * 导出设备台账列表
      */

aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java

@@ -88,6 +88,8 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "所属产线")
     private String productLineName;
 
+    private String productLinedDevice;
+
     /**
      * 工厂编号
      */
@@ -150,6 +152,14 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "资产编号")
     private String assetCode;
 
+    public String getProductLinedDevice() {
+        return productLinedDevice;
+    }
+
+    public void setProductLinedDevice(String productLinedDevice) {
+        this.productLinedDevice = productLinedDevice;
+    }
+
     public String getAssetCode() {
         return assetCode;
     }

aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceParam.java

@@ -22,6 +22,12 @@ public class BaseDeviceParam extends BaseEntity {
      */
     private Long objId;
 
+    /**
+     * 产线名称
+     */
+    @Excel(name = "产线名称")
+    private String productLineName;
+
     /**
      * 参数编号
      */
@@ -58,6 +64,12 @@ public class BaseDeviceParam extends BaseEntity {
     @Excel(name = "设备编号")
     private String deviceCode;
 
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
     /**
      * 读取频率（毫秒）
      */
@@ -96,6 +108,22 @@ public class BaseDeviceParam extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getProductLineName() {
+        return productLineName;
+    }
+
+    public void setProductLineName(String productLineName) {
+        this.productLineName = productLineName;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }

aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml

@@ -27,6 +27,7 @@
         <result property="teamName" column="TEAM_NAME"/>
         <result property="assetCode" column="ASSET_CODE"/>
         <result property="productLineName" column="PRODUCT_LINE_NAME"/>
+        <result property="productLinedDevice" column="productLinedDevice"/>
     </resultMap>
 
     <sql id="selectBaseDeviceLedgerVo">
@@ -53,7 +54,8 @@
                    WHEN te.TEAM_NAME IS NOT NULL THEN SUBSTR(te.TEAM_NAME, 1, LENGTH(te.TEAM_NAME) - 3) || '班组'
                    END TEAM_NAME,
                dl.ASSET_CODE,
-               pl.PRODUCT_LINE_NAME
+               pl.PRODUCT_LINE_NAME,
+               CONCAT(PRODUCT_LINE_NAME, DEVICE_NAME) productLinedDevice
         from base_deviceledger dl
                  left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = dl.PRODUCT_LINE_CODE
                  left join BASE_TEAMMEMBERS te on te.TEAM_CODE = dl.TEAM_CODE

aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml

@@ -18,17 +18,38 @@
         <result property="createdTime" column="created_time"/>
         <result property="updatedBy" column="updated_by"/>
         <result property="updatedTime" column="updated_time"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="productLineName" column="PRODUCT_LINE_NAME"/>
     </resultMap>
 
     <sql id="selectBaseDeviceParamVo">
-        select obj_id, param_code, param_name, param_network, param_address, param_type, device_code, read_frequency, is_flag, created_by, created_time, updated_by, updated_time from base_deviceparam
+        select dp.obj_id,
+               dp.param_code,
+               dp.param_name,
+               dp.param_network,
+               dp.param_address,
+               dp.param_type,
+               dp.device_code,
+               dp.read_frequency,
+               dp.is_flag,
+               dp.created_by,
+               dp.created_time,
+               dp.updated_by,
+               dp.updated_time,
+               dl.DEVICE_NAME,
+               pl.PRODUCT_LINE_NAME
+        from base_deviceparam dp
+                 left join BASE_DEVICELEDGER dl on dl.DEVICE_CODE = dp.DEVICE_CODE
+                 left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = dl.PRODUCT_LINE_CODE
     </sql>
 
     <select id="selectBaseDeviceParamList" parameterType="BaseDeviceParam" resultMap="BaseDeviceParamResult">
         <include refid="selectBaseDeviceParamVo"/>
         <where>
             <if test="paramCode != null  and paramCode != ''">and param_code = #{paramCode}</if>
-                        <if test="paramName != null  and paramName != ''"> and param_name like concat(concat('%', #{paramName}), '%')</if>
+            <if test="paramName != null  and paramName != ''">and param_name like concat(concat('%', #{paramName}),
+                '%')
+            </if>
             <if test="paramNetwork != null  and paramNetwork != ''">and param_network = #{paramNetwork}</if>
             <if test="paramAddress != null  and paramAddress != ''">and param_address = #{paramAddress}</if>
             <if test="paramType != null  and paramType != ''">and param_type = #{paramType}</if>
@@ -44,7 +65,7 @@
 
     <select id="selectBaseDeviceParamByObjId" parameterType="Long" resultMap="BaseDeviceParamResult">
         <include refid="selectBaseDeviceParamVo"/>
-            where obj_id = #{objId}
+        where dp.obj_id = #{objId}
     </select>
 
     <insert id="insertBaseDeviceParam" parameterType="BaseDeviceParam">
@@ -104,7 +125,9 @@
     </update>
 
     <delete id="deleteBaseDeviceParamByObjId" parameterType="Long">
-        delete from base_deviceparam where obj_id = #{objId}
+        delete
+        from base_deviceparam
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteBaseDeviceParamByObjIds" parameterType="String">