bca5f500739R86">86 
    }
87
88 
}

+ 21 - 7
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/ResourceToolManageController.java
Bestand weergeven 

@ -8,7 +8,6 @@ import java.util.Map;
8 8 
import org.apache.commons.lang.StringUtils;
9 9 
import org.springframework.beans.factory.annotation.Autowired;
10 10 
import org.springframework.stereotype.Controller;
11 
import org.springframework.util.CollectionUtils;
12 11 
import org.springframework.web.bind.annotation.ModelAttribute;
13 12 
import org.springframework.web.bind.annotation.RequestBody;
14 13 
import org.springframework.web.bind.annotation.RequestMapping;
 
@ -23,8 +22,6 @@ import com.ai.bss.security.protection.service.interfaces.ResourceToolManageServi
23 22 
import com.ai.bss.security.protection.utils.EbcConstant;
24 23 
import com.ai.bss.work.tool.model.ResourceTool;
25 24
26 
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
27
28 25 
/**
29 26 
 * 设备管理
30 27 
 * @author konghl@asiainfo.com
 
@ -85,12 +82,12 @@ public class ResourceToolManageController {
85 82 
			return CommonResponse.fail("500", "操作失败");
86 83 
		}
87 84
88 
		Map<String, Object> resultMap= ResourceToolManageService.queryResourceToolById(resourceToolId);
89
90 
		if (resultMap==null) {
85 
		Map<String, Object> resultMap = ResourceToolManageService.queryResourceToolById(resourceToolId);
86
87 
		if (resultMap == null) {
91 88 
			return CommonResponse.fail("504", "获取设备信息失败");
92 89 
		}
93
90
94 91 
		return CommonResponse.ok(resultMap);
95 92 
	}
96 93 
@ -168,4 +165,21 @@ public class ResourceToolManageController {
168 165 
		return CommonResponse.ok(resultMap);
169 166 
	}
170 167
168 
	/**
169 
	 * 根据设备CODE获取场景、AI任务等相关信息
170 
	 * @param meFile
171 
	 * @return
172 
	 * @throws Exception
173 
	 */
174 
	@ResponseBody
175 
	@RequestMapping("/getResourceToolAllInfo")
176 
	public CommonResponse<List<Map<String, Object>>>  getResourceToolAllInfo(@RequestParam String resourceToolCode)
177 
			throws Exception {
178 
		if (StringUtils.isEmpty(resourceToolCode)) {
179 
			return CommonResponse.fail("500", "resourceToolCode is null");
180 
		}
181
182 
		return ResourceToolManageService.getResourceToolAllInfo(resourceToolCode);
183 
	}
184
171 185 
}

+ 12 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/SysConfigAiTaskController.java
Bestand weergeven 

@ -6,6 +6,7 @@ import com.ai.bss.security.protection.model.AiQuery;
6 6
7 7 
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
8 8 
import com.ai.bss.security.protection.utils.EbcConstant;
9 
import com.ai.bss.work.safety.model.AiModel;
9 10 
import com.ai.bss.work.safety.model.AiTask;
10 11
11 12 
import org.slf4j.Logger;
 
@ -121,5 +122,16 @@ public class SysConfigAiTaskController {
121 122
122 123 
		return commonResponse;
123 124 
	}
125
126 
	/**
127 
	 * AI任务模型匹配下拉列表
128 
	 *
129 
	 * @return
130 
	 */
131 
	@ResponseBody
132 
	@RequestMapping("/queryAiTaskModelList")
133 
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
134 
		return sysConfigAiTaskService.queryAiTaskModelList();
135 
	}
124 136
125 137 
}

+ 2 - 7
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiAlarmManageServiceImpl.java
Bestand weergeven 

@ -40,6 +40,7 @@ import com.alibaba.fastjson.TypeReference;
40 40 
public class AiAlarmManageServiceImpl implements AiAlarmManageService {
41 41 
    @Autowired
42 42 
    WorkTaskCommand workTaskCommand;
43
43 44 
    @Autowired
44 45 
    AiTaskQuery aiTaskQuery;
45 46 
@ -81,11 +82,10 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
81 82 
                }
82 83 
            }
83 84 
            //根据报警类型查找报警中文名字
85 
			aiAlarm.put("alarmTypeName", aiAlarm.get("alarmTypeCode"));
84 86 
            aiAlarmTypeList.forEach((aiAlarmType) -> {
85 87 
                if (aiAlarmType.getCode().equals(aiAlarm.get("alarmTypeCode"))) {
86 88 
                    aiAlarm.put("alarmTypeName", aiAlarmType.getValue());
87 
                }else {
88 
                    aiAlarm.put("alarmTypeName", aiAlarm.get("alarmTypeCode"));
89 89 
                }
90 90 
            });
91 91 
        });
 
@ -100,11 +100,6 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
100 100 
    }
101 101
102 102 
	@Override
103 
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
104 
		return aiTaskQuery.findAiModelList(new CommonRequest<Void>(null));
105 
	}
106
107 
	@Override
108 103 
	public CommonResponse<List<Map<String, Object>>> queryAiTaskByDevice(String resourceToolId, String aiIdenModel) {
109 104 
		Map<String, Object> conditionMap = new HashMap<String, Object>();
110 105 
        conditionMap.put("resourceToolId", resourceToolId);

+ 80 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java
Bestand weergeven 

@ -0,0 +1,80 @@
1 
package com.ai.bss.security.protection.service.impl;
2
3 
import java.util.List;
4 
import java.util.Map;
5
6 
import org.slf4j.Logger;
7 
import org.slf4j.LoggerFactory;
8 
import org.springframework.beans.factory.annotation.Autowired;
9 
import org.springframework.stereotype.Service;
10
11 
import com.ai.abc.api.model.CommonRequest;
12 
import com.ai.abc.api.model.CommonResponse;
13 
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
14 
import com.ai.bss.components.common.model.PageBean;
15 
import com.ai.bss.person.model.Organization;
16 
import com.ai.bss.person.service.api.OrganizationQuery;
17 
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
18 
import com.ai.bss.security.protection.service.interfaces.EmployeeManagementService;
19 
import com.ai.bss.security.protection.utils.EbcConstant;
20 
import com.ai.bss.user.dto.EmployeeDto;
21 
import com.ai.bss.user.dto.UserDto;
22 
import com.ai.bss.user.service.api.EmployeeService;
23 
import com.ai.bss.user.service.api.UserDtoQuery;
24 
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
25
26 
@Service
27 
public class EmployeeManagementServiceImpl implements EmployeeManagementService {
28 
	Logger logger = LoggerFactory.getLogger(EmployeeManagementServiceImpl.class);
29
30 
	@Autowired
31 
	private UserDtoQuery userDtoQuery;
32
33 
	@Autowired
34 
	private OrganizationQuery organizationQuery;
35
36 
	@Autowired
37 
	private EmployeeService employeeService;
38
39 
	@Override
40 
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
41 
		// TODO 组织编码
42 
		// request.getData().setOrgCode("0000");
43 
		return userDtoQuery.queryWorkEmployee(request);
44 
	}
45
46 
	@Override
47 
	public CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception {
48 
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
49 
		return employeeService.createWorkEmployee(request);
50 
	}
51
52 
	@Override
53 
	public CommonResponse<Void> deleteWorkEmployee(Map<String, String> params) {
54 
		boolean success = true;
55
56 
		String ids = params.get("ids");
57 
		String[] idsArray = ids.split(",");
58 
		EmployeeDto employeeDto = new EmployeeDto();
59 
		for (String id : idsArray) {
60 
			long lid = Long.parseLong(id);
61 
			employeeDto.setId(lid);
62 
			CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
63 
			CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
64 
			success = success && response.isSuccess();
65 
		}
66
67 
		if (success) {
68 
			return CommonResponse.ok(null);
69 
		} else {
70 
			return CommonResponse.fail("504", "删除失败");
71 
		}
72 
	}
73
74 
	@Override
75 
	public CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto) {
76 
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
77 
		return employeeService.modifyEmployee(request);
78 
	}
79
80 
}

+ 13 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/ResourceToolManageServiceImpl.java
Bestand weergeven 

@ -16,10 +16,12 @@ import com.ai.abc.api.model.CommonResponse;
16 16 
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
17 17 
import com.ai.bss.components.common.model.PageBean;
18 18 
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
19 
import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
19 20 
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
20 21 
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
21 22 
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
22 23 
import com.ai.bss.security.protection.utils.EbcConstant;
24 
import com.ai.bss.work.safety.service.api.AiTaskQuery;
23 25 
import com.ai.bss.work.tool.model.ResourceTool;
24 26 
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
25 27 
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
 
@ -41,6 +43,9 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
41 43
42 44 
	@Autowired
43 45 
	private CharSpecService charSpecService;
46
47 
	@Autowired
48 
	private AiTaskQuery aiTaskQuery;
44 49
45 50 
	@Override
46 51 
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params,
 
@ -209,4 +214,12 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
209 214 
		return resultMap;
210 215 
	}
211 216
217 
	@Override
218 
	public CommonResponse<List<Map<String, Object>>> getResourceToolAllInfo(String resourceToolCode) {
219 
		Map<String, Object> conditionMap = new HashMap<String, Object>();
220 
        conditionMap.put("resourceToolCode", resourceToolCode);
221 
        CommonRequest<Map<String, Object>> request=new CommonRequest<Map<String, Object>>(conditionMap);
222 
        return aiTaskQuery.selectAiTaskDevice(request);
223 
	}
224
212 225 
}

+ 6 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/SysConfigAiTaskServiceImpl.java
Bestand weergeven 

@ -5,6 +5,7 @@ import com.ai.abc.api.model.CommonResponse;
5 5 
import com.ai.bss.components.common.model.PageBean;
6 6 
import com.ai.bss.security.protection.model.AiQuery;
7 7 
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
8 
import com.ai.bss.work.safety.model.AiModel;
8 9 
import com.ai.bss.work.safety.model.AiTask;
9 10 
import com.ai.bss.work.safety.service.api.AiTaskCommand;
10 11 
import com.ai.bss.work.safety.service.api.AiTaskQuery;
 
@ -67,5 +68,10 @@ public class SysConfigAiTaskServiceImpl implements SysConfigAiTaskService {
67 68 
        CommonResponse<AiTask> runningResult = aiTaskCommand.modifyAiTask(aiTaskRequest);
68 69 
        return runningResult;
69 70 
    }
71
72 
    @Override
73 
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
74 
		return aiTaskQuery.findAiModelList(new CommonRequest<Void>(null));
75 
	}
70 76
71 77 
}

+ 0 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiAlarmManageService.java
Bestand weergeven 

@ -26,12 +26,6 @@ public interface AiAlarmManageService {
26 26 
	CommonResponse<Map<String,Object>> queryOneAiAlarmInfo(@RequestParam String workTaskId) throws Exception;
27 27
28 28 
	/**
29 
	 * AI任务模型匹配下拉列表
30 
	 * @return
31 
	 */
32 
	CommonResponse<List<AiModel>> queryAiTaskModelList();
33
34 
	/**
35 29 
	 * 根据 设备id 和 匹配模型 查询 AI任务
36 30 
	 * @param resourceToolId 设备id
37 31 
	 * @param aiIdenModel 匹配模型

+ 47 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/EmployeeManagementService.java
Bestand weergeven 

@ -0,0 +1,47 @@
1 
package com.ai.bss.security.protection.service.interfaces;
2
3 
import java.util.List;
4 
import java.util.Map;
5
6 
import com.ai.abc.api.model.CommonRequest;
7 
import com.ai.abc.api.model.CommonResponse;
8 
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
9 
import com.ai.bss.components.common.model.PageBean;
10 
import com.ai.bss.person.model.Organization;
11 
import com.ai.bss.user.dto.EmployeeDto;
12 
import com.ai.bss.user.dto.UserDto;
13 
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
14
15 
public interface EmployeeManagementService {
16
17 
	/**
18 
	 * 人员列表分页查询
19 
	 * @param request
20 
	 * @return
21 
	 * @throws Exception
22 
	 */
23 
	CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
24
25 
	/**
26 
	 * 创建人员
27 
	 * @param employeeDto
28 
	 * @return
29 
	 * @throws Exception
30 
	 */
31 
	CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception;
32
33 
	/**
34 
	 * 删除人员
35 
	 * @param params
36 
	 * @return
37 
	 */
38 
	CommonResponse<Void> deleteWorkEmployee(Map<String, String> params);
39
40 
	/**
41 
	 * 修改人员
42 
	 * @param employeeDto
43 
	 * @return
44 
	 */
45 
	CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto);
46
47 
}

+ 8 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/ResourceToolManageService.java
Bestand weergeven 

@ -82,4 +82,12 @@ public interface ResourceToolManageService {
82 82 
	 * @throws Exception
83 83 
	 */
84 84 
	Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception;
85
86 
	/**
87 
	 * 根据设备CODE获取场景、AI任务等相关信息
88 
	 * @param resourceToolCode
89 
	 * @return
90 
	 */
91 
	CommonResponse<List<Map<String, Object>>> getResourceToolAllInfo(String resourceToolCode);
92
85 93 
}

+ 6 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/SysConfigAiTaskService.java
Bestand weergeven 

@ -4,6 +4,7 @@ import com.ai.abc.api.model.CommonRequest;
4 4 
import com.ai.abc.api.model.CommonResponse;
5 5 
import com.ai.bss.components.common.model.PageBean;
6 6 
import com.ai.bss.security.protection.model.AiQuery;
7 
import com.ai.bss.work.safety.model.AiModel;
7 8 
import com.ai.bss.work.safety.model.AiTask;
8 9 
import com.ai.bss.work.task.model.common.WorkTask;
9 10 
@ -21,4 +22,9 @@ public interface SysConfigAiTaskService {
21 22
22 23 
    CommonResponse<AiTask> modifyAiTask(AiTask aiTask);
23 24
25 
    /**
26 
	 * AI任务模型匹配下拉列表
27 
	 * @return
28 
	 */
29 
	CommonResponse<List<AiModel>> queryAiTaskModelList();
24 30 
}

+ 12 - 11
security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AiResultRecordKafkaTask.java
Bestand weergeven 

@ -3,7 +3,6 @@ package com.ai.bss.security.protection.service.task;
3 3 
import java.util.List;
4 4 
import java.util.Map;
5 5
6 
import org.apache.commons.lang.StringUtils;
7 6 
import org.apache.kafka.clients.consumer.ConsumerRecord;
8 7 
import org.springframework.beans.factory.annotation.Autowired;
9 8 
import org.springframework.kafka.annotation.KafkaListener;
 
@ -67,7 +66,8 @@ public class AiResultRecordKafkaTask {
67 66 
				throw new NullPointerException("resourceToolCode not exist");
68 67 
			}
69 68
70 
			String resourceToolId = String.valueOf(resourceToolMap.get("resourceToolId"));
69 
			String resourceToolId = resourceToolMap.get("resourceToolId") == null ? ""
70 
					: String.valueOf(resourceToolMap.get("resourceToolId"));
71 71
72 72 
			CommonResponse<List<Map<String, Object>>> sceneTerminalRelResponse = monitorSceneQuery
73 73 
					.selectSceneTerminalRel(new CommonRequest<Long>(Long.valueOf(resourceToolId)));
 
@ -89,17 +89,18 @@ public class AiResultRecordKafkaTask {
89 89 
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
90 90 
			});
91 91 
			aiIdenLog.setResourceToolId(resourceToolId);
92 
			aiIdenLog.setResourceToolName(
93 
					StringUtils.defaultIfBlank(String.valueOf(resourceToolMap.get("resourceToolName")), ""));
94 
			aiIdenLog.setMonitorSceneId(
95 
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("monitorSceneId")), ""));
96 
			aiIdenLog.setMonitorSceneName(
97 
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("monitorSceneName")), ""));
98 
			// aiIdenLog.setEffectType(StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("effectType")),EbcConstant.TERMINAL_EFFECT_TYPE_OTH));
92 
			aiIdenLog.setResourceToolName(resourceToolMap.get("resourceToolName") == null ? ""
93 
					: String.valueOf(resourceToolMap.get("resourceToolName")));
94 
			aiIdenLog.setMonitorSceneId(sceneTerminalRelMap.get("monitorSceneId") == null ? ""
95 
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneId")));
96 
			aiIdenLog.setMonitorSceneName(sceneTerminalRelMap.get("monitorSceneName") == null ? ""
97 
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneName")));
98 
			aiIdenLog.setEffectType(sceneTerminalRelMap.get("effectType") == null ? EbcConstant.TERMINAL_EFFECT_TYPE_OTH
99 
					: String.valueOf(sceneTerminalRelMap.get("effectType")));
99 100 
			aiIdenLog.setTerminalPosition(
100 
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("place")), ""));
101 
					sceneTerminalRelMap.get("place") == null ? "" : String.valueOf(sceneTerminalRelMap.get("place")));
101 102 
			aiIdenLog.setOrganizationId(
102 
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("orgId")), ""));
103 
					sceneTerminalRelMap.get("orgId") == null ? "" : String.valueOf(sceneTerminalRelMap.get("orgId")));
103 104 
			aiIdenLog.setAiTaskId(
104 105 
					aiTaskMap.get("aiTaskId") == null ? 0L : Long.valueOf(String.valueOf(aiTaskMap.get("aiTaskId"))));
105 106

wade-mobile-server和ipu-basic代码迁移测试通过 · fdd5301746 - Nuosi Git Service
Accueil Explorer Aide
Connexion
ipu
/
android-share
Suivre 6
Voter 0
Fork 0
Code Tickets 1 Pull Requests 1 Commits 932 Publications 4 Wiki
Parcourir la Source

wade-mobile-server和ipu-basic代码迁移测试通过

huangbo 9 ans auparavant
Parent
8c8f119773
commit
fdd5301746
5 fichiers modifiés avec 1 ajouts et 2 suppressions
Vue séparée Afficher les stats Diff
  1. 0 1
      display-server/.classpath
  2. 1 1
      display-server/etc/server-data.xml
  3. BIN
      wade-mobile-library/common/bcprov-jdk16-140.jar
  4. BIN
      wade-mobile-library/common/ipu-basic-1.0.jar
  5. BIN
      wade-mobile-library/common/wade-mobile-server.jar

+ 0 - 1
display-server/.classpath
Voir le fichier 

@ -35,7 +35,6 @@
35 35 
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-sqlite-jdbc.jar"/>
36 36 
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpasyncclient-4.0.1.jar"/>
37 37 
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-4.4.3.jar"/>
38 
	<classpathentry kind="lib" path="/wade-mobile-library/common/bcprov-jdk16-140.jar"/>
39 38 
	<classpathentry kind="lib" path="/wade-mobile-library/common/http-unirest-1.3.8.jar"/>
40 39 
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpclient-4.3.2.jar"/>
41 40 
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-ab-4.4.3.jar"/>

+ 1 - 1
display-server/etc/server-data.xml
Voir le fichier 

@ -7,7 +7,7 @@
7 7 
	<!-- 登录场景*******************初始化验证码 -->
8 8 
	<action name="SceneBean.initVerifyCode" class="com.ai.server.bean.SceneBean" method="initVerifyCode" verify="false"></action>
9 9 
	<!-- 登陆 -->
10 
	<action name="SceneBean.login" class="com.ai.server.bean.SceneBean" method="login" verify="false"  encrypt="false"></action>
10 
	<action name="SceneBean.login" class="com.ai.server.bean.SceneBean" method="login" verify="false"  encrypt="true"></action>
11 11 
	<!-- 刷新验证码 -->
12 12 
	<action name="SceneBean.refreshVerifyCode" class="com.ai.server.bean.SceneBean" method="refreshVerifyCode" verify="false"></action>
13 13

BIN
wade-mobile-library/common/bcprov-jdk16-140.jar
Voir le fichier


BIN
wade-mobile-library/common/ipu-basic-1.0.jar
Voir le fichier


BIN
wade-mobile-library/common/wade-mobile-server.jar
Voir le fichier