Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/controller/DeviceParmController.java

@@ -35,6 +35,18 @@ public class DeviceParmController {
         return new AjaxMessage<>(ResultStatus.OK, deviceParmService.selectById(id));
     }
 
+    @RequestMapping(value="getByDeviceId" , method = RequestMethod.GET)
+    @ApiOperation(value = "查询单个设备参数信息(参数设置页面)")
+    public AjaxMessage<List<DeviceParmEntity>> getByDeviceId(@ApiParam(value = "设备id") @RequestParam Integer id){
+        return new AjaxMessage<>(ResultStatus.OK, deviceParmService.selectByDeviceId(id));
+    }
+    @RequestMapping(value="batchEdit" , method = RequestMethod.POST)
+    @ApiOperation(value = "批量保存设备参数信息(参数设置页面)")
+    public AjaxMessage<Integer> batchEdit( @ApiParam(value = "设备参数信息") @RequestBody List<DeviceParmEntity> deviceParmEntities){
+        deviceParmService.saveOrUpdateBatch(deviceParmEntities);
+        return new AjaxMessage<>(ResultStatus.OK,1 );
+    }
+
     @RequestMapping(value="selectPage" , method = RequestMethod.GET)
     @ApiOperation(value = "分页查询设备参数信息")
     public AjaxMessage<Pagination<DeviceParmEntity>> selectPage(
@@ -66,12 +78,6 @@ public class DeviceParmController {
     public AjaxMessage<Integer> edit( @ApiParam(value = "设备参数信息") @RequestBody DeviceParmEntity deviceParmEntity){
         return new AjaxMessage<>(ResultStatus.OK, deviceParmService.update(deviceParmEntity));
     }
-    @RequestMapping(value="batchEdit" , method = RequestMethod.POST)
-    @ApiOperation(value = "批量修改设备参数信息")
-    public AjaxMessage<Integer> batchEdit( @ApiParam(value = "设备参数信息") @RequestBody List<DeviceParmEntity> deviceParmEntities){
-        deviceParmService.batchUpdate(deviceParmEntities);
-        return new AjaxMessage<>(ResultStatus.OK,1 );
-    }
 
     @RequestMapping(value="delete" , method = RequestMethod.DELETE)
     @ApiOperation(value = "单个删除设备参数信息")

sms_water/src/main/java/com/huaxu/controller/DeviceTypeController.java

@@ -22,7 +22,7 @@ import com.huaxu.service.DeviceTypeService;
  * @date 2020-11-18 08:21
  */
 @RestController
-@RequestMapping("/devicetype/devicetype")
+@RequestMapping("/devicetype")
 @Api(tags = "设备类型管理")
 public class DeviceTypeController {
 

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @date 2020-11-17 21:15
  */
 @RestController
-@RequestMapping("/scene/scene")
+@RequestMapping("/scene")
 @Api(tags = "场景管理")
 public class SceneController {
     @Autowired

sms_water/src/main/java/com/huaxu/controller/SceneTypeController.java

@@ -26,7 +26,7 @@ import com.huaxu.service.SceneTypeService;
  * @date 2020-11-17 19:31
  */
 @Controller
-@RequestMapping("/scenetype/scenetype")
+@RequestMapping("/scenetype")
 @Api(tags = "场景类型管理")
 public class SceneTypeController {
 

sms_water/src/main/java/com/huaxu/dao/DeviceParmMapper.java

@@ -1,7 +1,9 @@
 package com.huaxu.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.entity.DeviceParmEntity;
+import com.huaxu.entity.SceneTypeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,7 +15,7 @@ import java.util.List;
  * @data 2020-11-17 10:57
  */
 @Mapper
-public interface DeviceParmMapper {
+public interface DeviceParmMapper  {
 
     /**
      * 查询单个设备
@@ -63,4 +65,6 @@ public interface DeviceParmMapper {
      * @return
      */
     IPage<DeviceParmEntity> selectPage(IPage<DeviceParmEntity> page, DeviceParmEntity deviceParmEntity);
+
+    List<DeviceParmEntity> selectByDeviceId(Integer id);
 }

sms_water/src/main/java/com/huaxu/entity/DeviceParmEntity.java

@@ -28,7 +28,7 @@ public class DeviceParmEntity implements Serializable {
     @ApiModelProperty("设备属性id")
     private Integer attributeId;
     @ApiModelProperty("设备属性名称")
-    private Integer attributeName;
+    private String attributeName;
     @ApiModelProperty("是否地图悬浮显示")
     private Integer isSuspension;
     @ApiModelProperty("是否统计报表参数")

sms_water/src/main/java/com/huaxu/service/DeviceParmService.java

@@ -3,6 +3,7 @@ package com.huaxu.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.entity.DeviceParmEntity;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -16,6 +17,11 @@ public interface DeviceParmService {
      * @return
      */
     DeviceParmEntity selectById(Integer id);
+    /**
+     * 查询单个设备参数信息
+     * @return
+     */
+    List<DeviceParmEntity> selectByDeviceId(Integer id);
     /**
      * 添加设备参数
      * @return
@@ -44,6 +50,11 @@ public interface DeviceParmService {
      * @return
      */
     void batchUpdate(List<DeviceParmEntity> deviceParmEntities);
+    /**
+     * 批量保存设备参数信息
+     * @return
+     */
+    boolean saveOrUpdateBatch(Collection<DeviceParmEntity> entityList);
 
     /**
      * 查询设备参数信息

sms_water/src/main/java/com/huaxu/service/impl/DeviceParmServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huaxu.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaxu.dao.DeviceParmMapper;
 import com.huaxu.entity.DeviceParmEntity;
 import com.huaxu.model.LoginUser;
@@ -9,6 +10,7 @@ import com.huaxu.util.UserUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -18,7 +20,7 @@ import java.util.List;
  * @data 2020-11-17 11:02
  */
 @Service
-public class DeviceParmServiceImpl implements DeviceParmService {
+public class DeviceParmServiceImpl  implements DeviceParmService  {
 
     @Resource
     private DeviceParmMapper deviceParmMapper;
@@ -28,8 +30,20 @@ public class DeviceParmServiceImpl implements DeviceParmService {
         return deviceParmMapper.selectById(id);
     }
 
+    @Override
+    public List<DeviceParmEntity> selectByDeviceId(Integer id) {
+        return deviceParmMapper.selectByDeviceId(id);
+    }
+
     @Override
     public Integer insert(DeviceParmEntity deviceParmEntity) {
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        deviceParmEntity.setDateUpdate(new Date());
+        deviceParmEntity.setUpdateBy(loginUser.getUsername());
+        deviceParmEntity.setDateCreate(new Date());
+        deviceParmEntity.setCreateBy(loginUser.getUsername());
+        deviceParmEntity.setStatus(1);
+        deviceParmEntity.setTenantId(loginUser.getTenantId());
         return deviceParmMapper.insert(deviceParmEntity);
     }
 
@@ -67,6 +81,18 @@ public class DeviceParmServiceImpl implements DeviceParmService {
         }
     }
 
+    @Override
+    public boolean saveOrUpdateBatch(Collection<DeviceParmEntity> entityList) {
+        for (DeviceParmEntity item : entityList) {
+            if (item.getId() == null) {
+                this.insert(item);
+            } else {
+                this.update(item);
+            }
+        }
+        return true;
+    }
+
     @Override
     public List<DeviceParmEntity> selectList(DeviceParmEntity deviceParmEntity) {
         return deviceParmMapper.selectList(deviceParmEntity);
@@ -76,4 +102,5 @@ public class DeviceParmServiceImpl implements DeviceParmService {
     public IPage<DeviceParmEntity> selectPage(IPage<DeviceParmEntity> page, DeviceParmEntity deviceParmEntity) {
         return deviceParmMapper.selectPage(page,deviceParmEntity);
     }
+
 }

sms_water/src/main/java/com/huaxu/util/OrgInfoUtil.java

@@ -19,18 +19,30 @@ public class OrgInfoUtil {
 
         String tenantId = UserUtil.getCurrentUser().getTenantId();
         String key="orgInfo" + tenantId;
-        Map<String, String> keysValues = redisUtil.getHashValue(key);
-        if(keysValues.size()==0){
-            keysValues=new HashMap<>();
-            Org org=new Org();
-            org.setStatus(1);
-            org.setTenantId(tenantId);
-            List<Org> orgs = userCenterClient.getAllByTenantId();
-            for (Org org1 : orgs) {
-                keysValues.put(org1.getId()+"",org1.getOrgName());
-            }
-            redisUtil.putHashValues(key,keysValues);
+        String keysValue = (String) redisUtil.getHashValues(key,id+"");
+        if(keysValue==null){
+            Map<String,String>keysValues=updateOrgInfo(key);
+            keysValue=keysValues.get(id+"");
         }
-        return keysValues.get(id);
+        return keysValue;
     };
+    public Map<String,String>getAllOrgName(){
+        String tenantId = UserUtil.getCurrentUser().getTenantId();
+        String key="orgInfo" + tenantId;
+        Map<String, String> hashValue = redisUtil.getHashValue(key);
+        if(hashValue.size()==0){
+            hashValue=updateOrgInfo(key);
+        }
+        return hashValue;
+    }
+    private Map<String,String> updateOrgInfo(String key){
+
+        Map<String,String>keysValues=new HashMap<>();
+        List<Org> orgs = userCenterClient.getAllByTenantId();
+        for (Org org1 : orgs) {
+            keysValues.put(org1.getId()+"",org1.getOrgName());
+        }
+        redisUtil.putHashValues(key,keysValues);
+        return keysValues;
+    }
 }

sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huaxu.dao.DeviceParmMapper">
 
     <sql id="Base_Column_List">
-            p.ID as "id"
+             p.ID as "id"
             ,p.TENANT_ID as "tenantId"
             ,p.DEVICE_ID as "deviceId"
             ,p.ATTRIBUTE_ID as "attributeId"
@@ -25,6 +25,31 @@
     <sql id="deviceParmJoins">
         left join sms_device_attribute t on t.id= p.ATTRIBUTE_ID
     </sql>
+
+    <select id="selectByDeviceId" resultType="com.huaxu.entity.DeviceParmEntity">
+        select      p.ID as "id"
+                    ,p.TENANT_ID as "tenantId"
+                    ,p.DEVICE_ID as "deviceId"
+                    ,b.id  as "attributeId"
+                    ,p.IS_SUSPENSION as "isSuspension"
+                    ,p.IS_REPORT as "isReport"
+                    ,p.IS_CHART as "isChart"
+                    ,p.IS_MAP as "isMap"
+                    ,p.IS_ALARM as "isAlarm"
+                    ,p.IS_ARTWORK as "isArtwork"
+                    ,p.REMARK as "remark"
+                    ,p.STATUS as "status"
+                    ,p.DATE_CREATE as "dateCreate"
+                    ,p.CREATE_BY as "createBy"
+                    ,p.DATE_UPDATE as "dateUpdate"
+                    ,p.UPDATE_BY as "updateBy"
+                    ,b.`NAME` as "attributeName"
+        from sms_device  a
+        left join sms_device_attribute b on a.DEVICE_TYPE_ID=b.DEVICE_TYPE_ID and b.`STATUS`=1
+        left join sms_device_parm p on p.DEVICE_ID=a.id and p.ATTRIBUTE_ID=b.ID and p.`STATUS`=1
+        where a.id=#{id}
+    </select>
+
     <select id="selectById" resultType="com.huaxu.entity.DeviceParmEntity">
         select
         <include refid="Base_Column_List"/>