Merge remote-tracking branch 'origin/master'

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/controller/UserController.java

@@ -252,7 +252,7 @@ public class UserController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String userName,String realName,
+            String userName,String realName,String companyId,
             @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
             @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -261,7 +261,7 @@ public class UserController {
         Map<String,Object> searchParms = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","asc"));
+        sortList.add(new Sort("a.create_time","asc"));
 
         if (StringUtils.isNotEmpty(userName)) {
             searchParms.put("userName","%" + userName + "%");
@@ -271,6 +271,10 @@ public class UserController {
             searchParms.put("realName","%" + realName + "%");
         }
 
+        if (StringUtils.isNotEmpty(companyId)) {
+            searchParms.put("companyId",companyId);
+        }
+
         Page<User> page = userService.pageSearch(searchParms,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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/entity/User.java

@@ -3,6 +3,7 @@ package com.jpsoft.smart.modules.sys.entity;
 import java.util.Date;
 import java.util.List;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class User {
 	private String id;
 	private String companyId;
+	private String companyName;
 	private String userName;
 	private String password;
 	private String realName;
@@ -152,6 +154,9 @@ public class User {
 		this.roles = roles;
 	}
 
+	/**
+	 *设置企业名称
+	 */
 	public String getCompanyId() {
 		return companyId;
 	}
@@ -159,4 +164,15 @@ public class User {
 	public void setCompanyId(String companyId) {
 		this.companyId = companyId;
 	}
+
+	/**
+	 *设置企业名称
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
 }

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/base/PersonInfo.xml

@@ -150,6 +150,7 @@
             del_flag = 0
             <if test="searchParams.id != null">
                 and ID_ like #{searchParams.id}
+            </if>
             <if test="searchParams.name != null">
                 and name_ like #{searchParams.name}
             </if>

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

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

@@ -7,6 +7,7 @@
         <id property="id" column="id_"/>
         <result property="userName" column="user_name"/>
         <result property="companyId" column="company_id" />
+        <result property="companyName" column="company_name" />
         <result property="password" column="password_"/>
         <result property="realName" column="real_name"/>
         <result property="createTime" column="create_time"/>
@@ -90,14 +91,18 @@
     </select>
     <select id="search" parameterType="hashmap" resultMap="UserMap">
         <![CDATA[
-			select * from sys_user
-			where del_flag=0
+			select a.*,b.name_ as company_name
+			from sys_user a LEFT JOIN base_company_info b ON a.company_id = b.id_
+			where a.del_flag = 0
 		]]>
         <if test="searchParams.userName != null">
-            and user_name like #{searchParams.userName}
+            and a.user_name like #{searchParams.userName}
         </if>
         <if test="searchParams.realName != null">
-            and real_name like #{searchParams.realName}
+            and a.real_name like #{searchParams.realName}
+        </if>
+        <if test="searchParams.companyId != null">
+            and a.company_id = #{searchParams.companyId}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}