"> 108 
          item.remove()
109 
        })
98 110 
        bars.forEach((item, index) => {
99 
          time.forEach(item => {
100 
            item.remove()
101 
          })
102 
          start.forEach(item => {
103 
            item.remove()
104 
          })
105 
          volume.forEach(item => {
106 
            item.remove()
107 
          })
108 
          text.forEach(item => {
109 
            item.remove()
110 
          })
111 111 
          let txt = document.createElement('span')
112 112 
          txt.innerHTML = '集控室（人脸识别）'
113 113 
          txt.style.marginLeft = '12px'
@ -116,10 +116,9 @@ export default {
116 116 
          btn.style.cursor = 'pointer'
117 117 
          btn.style.marginLeft = 'auto'
118 118 
          btn.className = 'aidicon aidicon-image-outline'
119 
          btn.setAttribute('resourceToolId', item.value)
119 120 
          btn.setAttribute('title', '识别记录')
120 
          btn.addEventListener('click', () => {
121 
            this.goDistinguishRecord()
122 
          })
121 
          btn.addEventListener('click', this.goDistinguishRecord)
123 122 
          let btn1 = document.createElement('button')
124 123 
          btn1.style.color = 'white'
125 124 
          btn1.style.cursor = 'pointer'
@ -248,7 +247,8 @@ export default {
248 247 
      })
249 248 
    },
250 249 
    // 进入识别记录界面
251 
    goDistinguishRecord (id) {
250 
    goDistinguishRecord (e) {
251 
      var id = e.target.getAttribute('resourceToolId')
252 252 
      this.$router.push({ path: '/videoSurveillance/distinguishRecord', query: { videoId: id } })
253 253 
    },
254 254 
    // 风场大门分页

+ 32 - 11
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/EmployeeManagementController.java
View File 

@ -44,8 +44,8 @@ public class EmployeeManagementController {
44 44 
	 */
45 45 
	@ResponseBody
46 46 
	@RequestMapping("/queryEmployeeList")
47 
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(@ModelAttribute AttendanceReport attendanceReport)
48 
			throws Exception {
47 
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(
48 
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
49 49 
		// 当前页数
50 50 
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
51 51 
		// 每页条数
 
@ -84,8 +84,17 @@ public class EmployeeManagementController {
84 84 
	@ResponseBody
85 85 
	@RequestMapping("/createEmployee")
86 86 
	public CommonResponse<Void> createEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
87 
		if (employeeDto == null || StringUtils.isEmpty(employeeDto.getName())||StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
88 
			return CommonResponse.fail("500", "新增失败");
87 
		if (employeeDto == null) {
88 
			return CommonResponse.fail("500", "员工信息新增失败，参数为空");
89 
		}
90 
		if (StringUtils.isEmpty(employeeDto.getName())) {
91 
			return CommonResponse.fail("500", "员工信息新增失败，项目为空");
92 
		}
93 
		if (StringUtils.isEmpty(employeeDto.getCode())) {
94 
			return CommonResponse.fail("500", "员工信息新增失败，编号为空");
95 
		}
96 
		if (StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
97 
			return CommonResponse.fail("500", "员工信息新增失败，部门为空");
89 98 
		}
90 99
91 100 
		return employeeManagementService.createEmployee(employeeDto);
 
@ -100,8 +109,20 @@ public class EmployeeManagementController {
100 109 
	@ResponseBody
101 110 
	@RequestMapping("/modifyEmployee")
102 111 
	public CommonResponse<Void> modifyEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
103 
		if (employeeDto == null || employeeDto.getId() == null || StringUtils.isEmpty(employeeDto.getName())) {
104 
			return CommonResponse.fail("500", "修改失败");
112 
		if (employeeDto == null) {
113 
			return CommonResponse.fail("500", "员工信息修改失败，参数为空");
114 
		}
115 
		if (employeeDto.getId() == null) {
116 
			return CommonResponse.fail("500", "员工信息修改失败，主键为空");
117 
		}
118 
		if (StringUtils.isEmpty(employeeDto.getName())) {
119 
			return CommonResponse.fail("500", "员工信息修改失败，项目为空");
120 
		}
121 
		if (StringUtils.isEmpty(employeeDto.getCode())) {
122 
			return CommonResponse.fail("500", "员工信息修改失败，编号为空");
123 
		}
124 
		if (StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
125 
			return CommonResponse.fail("500", "员工信息修改失败，部门为空");
105 126 
		}
106 127
107 128 
		return employeeManagementService.modifyEmployee(employeeDto);
 
@ -132,9 +153,8 @@ public class EmployeeManagementController {
132 153 
	 */
133 154 
	@ResponseBody
134 155 
	@RequestMapping("/uploadEmployeePicture")
135 
	public CommonResponse<Map<String, String>> uploadEmployeePicture(
136 
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
137 
			throws Exception {
156 
	public CommonResponse<Map<String, String>> uploadEmployeePicture(@RequestParam(value = "file") MultipartFile meFile,
157 
			@RequestParam(required = false) String pictureUrl) throws Exception {
138 158 
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
139 159 
			return CommonResponse.fail("500", "上传失败");
140 160 
		}
 
@ -153,11 +173,12 @@ public class EmployeeManagementController {
153 173 
	@ResponseBody
154 174 
	@RequestMapping("/auditEmployeePicture")
155 175 
	public CommonResponse<Void> auditEmployeePicture(@RequestBody EmployeeDto employeeDto) throws Exception {
156 
		if (employeeDto.getId()==null||employeeDto.getId()<0||StringUtils.isEmpty(employeeDto.getField2())) {
176 
		if (employeeDto.getId() == null || employeeDto.getId() < 0 || StringUtils.isEmpty(employeeDto.getField2())) {
157 177 
			return CommonResponse.fail("500", "审核失败");
158 178 
		}
159 179
160 
		return employeeManagementService.auditEmployeePicture(employeeDto.getId(),employeeDto.getField2(),employeeDto.getField3());
180 
		return employeeManagementService.auditEmployeePicture(employeeDto.getId(), employeeDto.getField2(),
181 
				employeeDto.getField3());
161 182 
	}
162 183
163 184 
	/**

+ 49 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java
View File 

@ -106,14 +106,20 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
106 106 
		resultMap.put("organizationCode", response.getData().getOrganizeCode());
107 107 
		resultMap.put("organizationName", response.getData().getOrgName());
108 108 
		resultMap.put("age", response.getData().getAge());
109
109 110 
		resultMap.put("mainWirelessCall", response.getData().getMainWirelessCall());
110 111 
		resultMap.put("field1", response.getData().getField1()); // 头像标识
111 112 
		resultMap.put("field2", response.getData().getField2()); // 审核结果
112 113 
		resultMap.put("field3", response.getData().getField3()); // 审核意见
113 114 
		resultMap.put("field4", response.getData().getField4()); // 公司
114 115
115 
		resultMap.put("pictureUrl",uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
116 
		if (response.getData().getBirthday()!=null) {
117 
			resultMap.put("birthday", String.valueOf(response.getData().getBirthday().getTime()));
118 
		}
116 119
120 
		resultMap.put("pictureUrl",
121 
				uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
122
117 123 
		String employeePosition = response.getData().getMainJobPosition();
118 124 
		resultMap.put("employeePosition", employeePosition);
119 125 
@ -128,8 +134,46 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
128 134 
		return CommonResponse.ok(resultMap);
129 135 
	}
130 136
137 
	/**
138 
	 * 是否存在用户编码
139 
	 * @param code
140 
	 * @param id
141 
	 * @return
142 
	 * @return true:存在，false:不存在
143 
	 */
144 
	private boolean isExistEmployeeCode(String code, String id) {
145 
		if (StringUtils.isBlank(code)) {
146 
			return false;
147 
		}
148
149 
		UserDto userDto = new UserDto();
150 
		userDto.setCode(code);
151 
		CommonRequest<UserDto> request = new CommonRequest<UserDto>(userDto);
152 
		CommonResponse<List<Map<String, Object>>> response = userDtoQuery.queryWorkEmployeeByUserCode(request);
153
154 
		boolean result = false;
155 
		if (!CollectionUtils.isEmpty(response.getData())) {
156 
			if (StringUtils.isNotBlank(id)) {
157 
				for (Map<String, Object> map : response.getData()) {
158 
					if (code.equals(String.valueOf(map.get("code"))) && !id.equals(String.valueOf(map.get("id")))) {
159 
						result = true;
160 
						break;
161 
					}
162 
				}
163 
			} else {
164 
				result = true;
165 
			}
166 
		}
167
168 
		return result;
169 
	}
170
131 171 
	@Override
132 172 
	public CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception {
173 
		if (isExistEmployeeCode(employeeDto.getCode(), null)) {
174 
			return CommonResponse.fail("501", "编号已存在");
175 
		}
176
133 177 
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
134 178 
		CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
135 179 
		return employeeService.createWorkEmployee(request);
 
@ -137,6 +181,10 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
137 181
138 182 
	@Override
139 183 
	public CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) {
184 
		if (isExistEmployeeCode(employeeDto.getCode(), String.valueOf(employeeDto.getId()))) {
185 
			return CommonResponse.fail("501", "编号已存在");
186 
		}
187
140 188 
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
141 189 
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
142 190 
		return employeeService.modifyEmployee(request);

[Add] IPUMobileUI (4.0.1) · a56fee099a - Nuosi Git Service
首页 探索 帮助
登录
ipu
/
ipu-spec
关注 2
点赞 0
派生 0
代码 工单管理 0 合并请求 0 提交历史 5 版本发布 0 Wiki
浏览代码

[Add] IPUMobileUI (4.0.1)

秋林 3 年之前
父节点
873a8da013
当前提交
a56fee099a
共有 1 个文件被更改，包括 27 次插入 和 0 次删除
分列视图 显示文件统计
  1. 27 0
      IPUMobileUI/4.0.1/IPUMobileUI.podspec

+ 27 - 0
IPUMobileUI/4.0.1/IPUMobileUI.podspec
查看文件 

@ -0,0 +1,27 @@
1
2 
Pod::Spec.new do |spec|
3 
  spec.name         = "IPUMobileUI"
4 
  spec.version      = "4.0.1"
5 
  spec.summary      = "IPU移动框架."
6 
  spec.description  = "IPU移动框架iOS基础库"
7 
  spec.homepage     = "http://aiipu.com"
8 
  spec.author       = { "" => "asiainfoipu@aiipu.com" }
9 
  spec.platform     = :ios, "9.0"
10
11
12 
  spec.source                 = { :git => "http://10.1.235.20:3000/ipu/ios-share.git", :tag => "#{spec.version}" }
13 
  spec.source_files           = "IPUFrameworks/IPUMobileUI.framework/Headers/*.{h}"
14 
  spec.ios.vendored_framework = "IPUFrameworks/IPUMobileUI.framework"
15 
  spec.resource               = "IPUFrameworks/IPUMobileUI.bundle"
16
17 
  spec.dependency "IPUFoundation"
18 
  spec.dependency "IPUMobile"
19
20 
  spec.frameworks = "Foundation", "UIKit"
21
22 
  spec.requires_arc         = true
23 
  spec.pod_target_xcconfig  = { 'skip_validation' => true, 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
24 
  spec.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
25 
  spec.pod_target_xcconfig  = { 'OTHER_LDFLAGS' => '-lObjC' }
26
27 
end