翻译设备类型

src/main/java/com/jpsoft/smart/modules/base/controller/DeviceInfoController.java

@@ -6,6 +6,7 @@ import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.dto.MessageResult;
 import com.jpsoft.smart.modules.base.entity.DeviceInfo;
 import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -29,6 +30,9 @@ public class DeviceInfoController {
     @Autowired
     private DeviceInfoService deviceInfoService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     @ApiOperation(value="添加设备")
     @PostMapping("add")
     public MessageResult<DeviceInfo> add(@RequestBody DeviceInfo deviceInfo,@RequestAttribute String subject){
@@ -217,6 +221,11 @@ public class DeviceInfoController {
 
         Page<DeviceInfo> page = deviceInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (DeviceInfo deviceInfo:page) {
+            String typeN = dataDictionaryService.findParentId("ddf2ecbe-84a6-4f0d-a84f-2fc6917f5856",deviceInfo.getType());
+            deviceInfo.setTypeN(typeN);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 

src/main/java/com/jpsoft/smart/modules/base/entity/DeviceInfo.java

@@ -4,12 +4,21 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import com.jpsoft.smart.modules.base.service.impl.DeviceInfoServiceImpl;
+import com.jpsoft.smart.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.sys.service.impl.DataDictionaryServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import javax.annotation.Resource;
+
 /**
   描述:base_device_info的实体类
  */
@@ -74,8 +83,14 @@ public class DeviceInfo {
 	/**
 	 *类型
 	 */
-        @ApiModelProperty(value = "类型")
+	@ApiModelProperty(value = "类型")
 	private String type;
+
+	/**
+	 *类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typeN;
 	/**
 	 *是否删除
 	 */
@@ -115,4 +130,5 @@ public class DeviceInfo {
 		}
 		return isOnlineN;
 	}
+
 }

src/main/java/com/jpsoft/smart/modules/sys/dao/DataDictionaryDAO.java

@@ -19,5 +19,6 @@ public interface DataDictionaryDAO {
 	String getValue(String id);
 	List<DataDictionary> list();
 	List<Map<String, Object>> queryChildren(String parentId);
+	String findParentId(String parentId,String value);
 	List<DataDictionary> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

src/main/java/com/jpsoft/smart/modules/sys/service/DataDictionaryService.java

@@ -16,6 +16,7 @@ public interface DataDictionaryService {
 	String getName(String id);
 	String getValue(String id);
 	List<DataDictionary> list();
+	String findParentId(String parentId,String value);
 	List<Map<String, Object>> queryChildren(String parentId);
 	Page<DataDictionary> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

src/main/java/com/jpsoft/smart/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -68,6 +68,11 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 		return dataDictionaryDAO.list();
 	}
 
+	@Override
+	public String findParentId(String parentId,String value){
+		return dataDictionaryDAO.findParentId(parentId,value);
+	}
+
 	@Override
 	public List<Map<String, Object>> queryChildren(String parentId){
 		return dataDictionaryDAO.queryChildren(parentId);

src/main/resources/mapper/sys/DataDictionary.xml

@@ -97,6 +97,12 @@
     <select id="list" resultMap="DataDictionaryMap">
         select * from sys_data_dictionary where del_flag = 0
     </select>
+    <select id="findParentId" parameterType="string" resultType="string">
+        select a.name_ as name
+        from sys_data_dictionary a
+        where a.parent_id =#{parentId} and a.value_=#{value} and a.del_flag = 0
+        order by a.sort_no asc
+    </select>
     <select id="search" parameterType="hashmap" resultMap="DataDictionaryMap">
         <![CDATA[
 			SELECT