screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -135,6 +135,11 @@ */ private String extend; /** * 乡镇，街道code */ private Integer townCode; /* * 设备型号 * */ screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -25,6 +25,7 @@ <result column="install_time" property="installTime"/> <result column="is_delete" property="isDelete"/> <result column="extend" property="extend"/> <result column="town_code" property="townCode"/> </resultMap> <!--监测因子趋势图数据--> screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -129,6 +129,11 @@ */ private String extend; /** * 乡镇，街道code */ private Integer townCode; @Override protected Serializable pkVal() { screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -25,6 +25,7 @@ <result column="install_time" property="installTime"/> <result column="is_delete" property="isDelete"/> <result column="extend" property="extend"/> <result column="town_code" property="townCode"/> </resultMap> </mapper> screen-manage/src/main/java/com/moral/api/entity/Device.java
@@ -135,6 +135,11 @@ */ private String extend; /** * 乡镇，街道code */ private Integer townCode; /* * 设备型号 * */ screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
@@ -22,7 +22,6 @@ * */ private List<Map<String, Object>> professions; /* * 工艺 * */ @@ -63,5 +62,10 @@ * */ private List<ManageAccount> operators; /* * 乡镇街道 * */ private Map<String, Object> town; } screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -348,6 +348,9 @@ //扩展字段 deviceInfo.put("extend", device.getExtend()); //乡镇街道信息 deviceInfo.put("town", device.getTown()); //行业 deviceInfo.put("professions", device.getProfessions());
@@ -25,6 +25,7 @@ <result column="install_time" property="installTime"/> <result column="is_delete" property="isDelete"/> <result column="extend" property="extend"/> <result column="town_code" property="townCode"/> </resultMap> <resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap"> @@ -62,6 +63,12 @@ <association property="version" javaType="com.moral.api.entity.Version"> <result column="version_id" property="id"/> <result column="version_name" property="name"/> </association> <!--乡镇街道--> <association property="town" javaType="java.util.HashMap"> <result column="town_code" property="areaCode"/> <result column="town_name" property="name"/> </association> <!--设备维护人--> @@ -124,6 +131,8 @@ d.create_time, d.install_time, d.extend, d.town_code, sa.area_name town_name, o.id org_id, o.`name` org_name, mp.id mp_id, @@ -156,13 +165,16 @@ ( ma.id, (SELECT operate_ids FROM device WHERE id = d.id) ) LEFT JOIN `sys_area` sa ON d.town_code = sa.area_code LEFT JOIN ( SELECT sdt.`name`, sdd.dataKey, sdd.dataValue FROM sys_dict_type sdt, sys_dict_data sdd WHERE sdt.id = sdd.dict_type_id AND sdt.`name` = 'profession' AND sdt.`name` = 'profession' AND sdd.is_delete = '0' ) profession ON FIND_IN_SET ( @@ -175,7 +187,8 @@ FROM sys_dict_type sdt, sys_dict_data sdd WHERE sdt.id = sdd.dict_type_id AND sdt.`name` = 'tech' AND sdt.`name` = 'tech' AND sdd.is_delete = '0' ) tech ON d.tech = tech.dataKey @@ -185,7 +198,8 @@ FROM sys_dict_type sdt, sys_dict_data sdd WHERE sdt.id = sdd.dict_type_id AND sdt.`name` = 'detector' AND sdt.`name` = 'detector' AND sdd.is_delete = '0' ) detector ON d.detector = detector.dataKey @@ -195,7 +209,8 @@ FROM sys_dict_type sdt, sys_dict_data sdd WHERE sdt.id = sdd.dict_type_id AND sdt.`name` = 'purchaser' AND sdt.`name` = 'purchaser' AND sdd.is_delete = '0' ) purchaser ON d.purchaser = purchaser.dataKey WHERE d.id = #{deviceId}
