Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -27,6 +27,10 @@ public interface UserCenterClient {
     @GetMapping("/user/findUserIdsByOrgId")
     AjaxMessage<List<UserEntity>> findUserIdsByOrgId(@RequestParam("ids") String ids);
 
+
+    @GetMapping("/user/findUserIdsByOrgIdAndType")
+    AjaxMessage<List<UserEntity>> findUserIdsByOrgIdAndType(@RequestParam("ids") String ids);
+
     @PostMapping("/user/findUserIdsByUserIds")
     List<UserEntity> findUserIdsByUserIds(@RequestParam("ids") Long[] ids);
 

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -8,8 +8,6 @@ import com.huaxu.common.ConvertXY;
 import com.huaxu.common.FileUploadUtil;
 import com.huaxu.common.MyPoint;
 import com.huaxu.entity.Message;
-import com.huaxu.evaluation.entity.EvaluationCycleEntity;
-import com.huaxu.evaluation.enums.EvaluationCycleEnums;
 import com.huaxu.evaluation.service.EvaluationCycleService;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
@@ -77,9 +75,6 @@ public class WorkOrderManageController {
     @Autowired
     UserCenterClient userCenterClient;
 
-    @Autowired
-    private EvaluationCycleService evaluationCycleService;
-
     @Autowired
     private MessageSendUtil messageSendUtil;
 
@@ -749,7 +744,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "wkid", required = false) @RequestParam(required = false) String wkid,
             @ApiParam(value = "偏移量(x,y)", required = false) @RequestParam(required = false) String moveXY){
         List<Map<String,Object>> result = new ArrayList<>();
-        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%s]",ids));
+        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgIdAndType(String.format("[%s]",ids));
         for(UserEntity userEntity : listAjaxMessage.getData()){
             try {
                 Map<String, Object> orderStatusMap = workOrderManageService.selectOrderUserStatus(userEntity.getId().toString());

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -409,8 +409,8 @@ public class WorkOrderStatisticsController {
         try {
             String [] userIdArray = ids.split(",");
             List<String> idList = Arrays.asList(userIdArray);
-            sendMessage(idList, content, 8,0);
-            sendMessage(idList, content, 9,1);
+            // sendMessage(idList, content, 8,0);//channel:0 pc
+            sendMessage(idList, content, 9,1); //channel:1 app
             return new AjaxMessage<>(ResultStatus.OK);
         }catch (Exception ex){
         }

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

@@ -275,21 +275,21 @@ public class SceneController {
         parmSettingEntity.setParmType(3);
         List<ParmSettingEntity> paramSettingList = parmSettingService.findList(parmSettingEntity);
         if(paramSettingList.size()==0){
-            return new AjaxMessage<>(ResultStatus.ERROR,"没有配置故障率参数");
+            return new AjaxMessage<>(55555,"没有配置故障率参数",null);
         }
         ParmSettingEntity parmSetting = paramSettingList.get(0);
         String paramValue = parmSetting.getParmValue();
         String[] params =  paramValue.split(";");
         if(params.length!=3 ){
-           return new AjaxMessage<>(ResultStatus.ERROR,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2");
+           return new AjaxMessage<>(55555,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2",null);
         }
         String[] mParam = params[1].split("~");
         if(mParam.length!=2){
-           return new AjaxMessage<>(ResultStatus.ERROR,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2");
+           return new AjaxMessage<>(55555,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2",null);
         }
         if(validateNumber(params[0])==false || validateNumber(params[2])==false
                 || validateNumber(mParam[0])==false || validateNumber(mParam[1])==false){
-            return new AjaxMessage<>(ResultStatus.ERROR,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2");
+            return new AjaxMessage<>(55555,"参数设置格式错误!请参照正确格式设置:0.5;0.5~0.2;0.2",null);
         }
         List<Map<String,Object>> list = sceneService.selectAlarmSceneAndDevice(sceneEntity, startDate, endDate);
         for(int i=0;i<list.size();i++){

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -323,7 +323,7 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 		UserEntity userEntity=new UserEntity();
 		userEntity.setTenantId(currentUser.getTenantId());
 		userEntity.setProgramItems(currentUser.getProgramItemList());
-		userEntity.setUserType(currentUser.getType());
+		userEntity.setUserType(3+"");
 		//1是公司，2是公司及以下，3部门，4部门及以下，5自定义
 		userEntity.setPermissonType(currentUser.getPermissonType());
 		List<UserEntity>userEntities=userMapper.findUserList(userEntity);

user_center/src/main/resources/mapper/UserMapper.xml

@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join uims_org company on a.COMPANY_ORG_ID=company.ID
             left join uims_org  department on a.DEPT_ORG_ID=department.ID
             <where>
-                a.status=1 and a.user_type != -9999
+                a.status=1 and a.user_type = 3
                 <if test="user.tenantId != null  and user.tenantId != ''"> and a.tenant_id = #{user.tenantId} </if>
 
                 <if test="user.deptOrgId != null  and user.deptOrgId != ''">