Página Inicial Explorar Ajuda
Entrar
asiainfo
/
ebc
Observar 4
Favorito 0
Fork 0
Código Problemas 0 Pull Requests 0 Commits 313 Versões 0 Wiki
Ver Código Fonte

修改考勤规则保存接口

wangdong6 4 anos atrás
pai
90d166c419
commit
0a4363b385
7 arquivos alterados com 361 adições e 183 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 15 2
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceRulesController.java
  2. 13 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkOrderManagementController.java
  3. 3 2
      security-protection-service/src/main/java/com/ai/bss/security/protection/dto/AttendanceRuleDto.java
  4. 179 173
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
  5. 142 1
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java
  6. 5 5
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceRulesService.java
  7. 4 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkOrderManagementService.java

+ 15 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceRulesController.java
Ver Arquivo 

@ -21,7 +21,6 @@ public class AttendanceRulesController {
21 21
22 22 
	@Autowired
23 23 
	AreaInRecordService areaInRecordService;
24
25 24 
	@Autowired
26 25 
	AttendanceRulesService attendanceRulesService;
27 26 
@ -49,6 +48,20 @@ public class AttendanceRulesController {
49 48 
//	public CommonResponse createAttendanceRule(@RequestBody AttendanceRuleParams attendanceRuleParams) throws Exception {
50 49 
	public CommonResponse createAttendanceRule(@RequestBody Map<String,Object> paramsMap) throws Exception {
51 50
52 
		return attendanceRulesService.createAttendanceRule(paramsMap);
51 
		return CommonResponse.ok(attendanceRulesService.createAttendanceRule(paramsMap));
53 52 
	}
53
54 
//	/**
55 
//	 * 修改考勤规则
56 
//	 * @param paramsMap
57 
//	 * @return
58 
//	 * @throws Exception
59 
//	 */
60 
//	@ResponseBody
61 
//	@RequestMapping("/modifyAttendanceRule")
62 
////	public CommonResponse createAttendanceRule(@RequestBody AttendanceRuleParams attendanceRuleParams) throws Exception {
63 
//	public CommonResponse modifyAttendanceRule(@RequestBody Map<String,Object> paramsMap) throws Exception {
64 
//
65 
//		return attendanceRulesService.modifyAttendanceRule(paramsMap);
66 
//	}
54 67 
}

+ 13 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkOrderManagementController.java
Ver Arquivo 

@ -4,12 +4,14 @@ import java.util.HashMap;
4 4 
import java.util.List;
5 5 
import java.util.Map;
6 6
7 
import com.ai.bss.infrastructure.protocol.ResponseResult;
7 8 
import org.apache.commons.lang.StringUtils;
8 9 
import org.slf4j.Logger;
9 10 
import org.slf4j.LoggerFactory;
10 11 
import org.springframework.beans.factory.annotation.Autowired;
11 12 
import org.springframework.stereotype.Controller;
12 13 
import org.springframework.web.bind.annotation.RequestMapping;
14 
import org.springframework.web.bind.annotation.RequestMethod;
13 15 
import org.springframework.web.bind.annotation.RequestParam;
14 16 
import org.springframework.web.bind.annotation.ResponseBody;
15 17 
@ -17,6 +19,7 @@ import com.ai.abc.api.model.CommonResponse;
17 19 
import com.ai.bss.components.common.model.PageBean;
18 20 
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
19 21 
import com.ai.bss.security.protection.util.EbcConstant;
22 
import org.springframework.web.multipart.MultipartFile;
20 23
21 24 
/**
22 25 
 * 工单管理
 
@ -155,4 +158,14 @@ public class WorkOrderManagementController {
155 158 
		return workOrderManagementService.checkAlppyVacationInfo(mapTagInfoDto);
156 159 
	}*/
157 160
161
162 
	@RequestMapping("/importAskLeaveOrder")
163 
	public CommonResponse importAskLeaveOrder(@RequestParam("file") MultipartFile file) {
164
165 
			workOrderManagementService.importAskLeaveOrder(file);
166
167 
		return CommonResponse.OK_VOID;
168
169 
	}
170
158 171 
}

+ 3 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/dto/AttendanceRuleDto.java
Ver Arquivo 

@ -8,8 +8,8 @@ import java.util.Map;
8 8 
@Data
9 9 
public class AttendanceRuleDto {
10 10
11 
    private Integer pageNumber;
12 
    private Integer pageSize;
11 
//    private Integer pageNumber;
12 
//    private Integer pageSize;
13 13 
    private Long goToWorkAheadMinutes;
14 14 
    private Long goToWorkPostponeMinutes;
15 15 
    private Long minWorkMinutes;
 
@ -23,6 +23,7 @@ public class AttendanceRuleDto {
23 23 
    private Long earlyExitAlarmThreshold;
24 24 
    private Long absentAlarmThreshold;
25 25 
    private Long workTaskSpecId;
26 
    private Long workTaskSpecPlanId;
26 27 
    private String workTaskSpecTypeId;
27 28 
    private String name;
28 29 
    private String charValueSet;

+ 179 - 173
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
Ver Arquivo 

@ -38,52 +38,48 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
38 38
39 39
40 40 
    @Override
41 
    public CommonResponse createAttendanceRule(Map<String,Object> paramMap) throws Exception {
41 
    public AttendanceRuleDto createAttendanceRule(Map<String,Object> paramMap) throws Exception {
42 42
43 43
44 44 
        AttendanceTaskSpec attendanceTaskSpec = new AttendanceTaskSpec();
45 45
46 
//        AttendanceRuleParams
47 
//        "attendanceTaskSpec":{
48 
//            "goToWorkAheadMinutes": 60,
49 
//                    "goToWorkPostponeMinutes": 20,
50 
//                    "goToWorkDeadLine": 60,
51 
//                    "goOffWorkAheadMinutes": 60,
52 
//                    "goOffWorkPostponeMinutes": 10,
53 
//                    "g0OffWorkDeadLine": 30,
54 
//                    "allowFieldClocking": "0",
55 
//                    "lateAlarmThreshold": 5,
56 
//                    "earlyExitAlarmThreshold": 5,
57 
//                    "absentAlarmThreshold": 3,
58 
//                    "workTaskSpecId": "",
59 
//                    "workTaskSpecTypeId": "CLOCKING",
60 
//                    "name": "打卡",
61 
//                    "charValueSet": "{}"
62 
//        },
63 
        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes").toString()));
64 
        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkPostponeMinutes").toString()));
65 
        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?null:Long.parseLong(paramMap.get("goToWorkDeadLine").toString()));
66 
        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkAheadMinutes").toString()));
67 
        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes").toString()));
68 
        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes").toString()));
46 
        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?0:Long.parseLong(paramMap.get("goToWorkAheadMinutes").toString()));
47 
        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?0:Long.parseLong(paramMap.get("goToWorkPostponeMinutes").toString()));
48 
        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?0:Long.parseLong(paramMap.get("goToWorkDeadLine").toString()));
49 
        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?0:Long.parseLong(paramMap.get("goOffWorkAheadMinutes").toString()));
50 
        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?0:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes").toString()));
51 
        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?0:Long.parseLong(paramMap.get("goToWorkAheadMinutes").toString()));
69 52 
        attendanceTaskSpec.setAllowFieldClocking(paramMap.get("goToWorkAheadMinutes")==null?null:paramMap.get("goToWorkAheadMinutes").toString());
70 
        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?null:Long.parseLong(paramMap.get("lateAlarmThreshold").toString()));
71 
        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?null:Long.parseLong(paramMap.get("earlyExitAlarmThreshold").toString()));
72 
        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold").toString()));
73 
        attendanceTaskSpec.setWorkTaskSpecId(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold").toString()));
74 
//        attendanceTaskSpec.setWorkTaskSpecTypeId(paramMap.get("workTaskSpecTypeId")==null?"CLOCKING":paramMap.get("workTaskSpecTypeId"));
53 
        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?0:Long.parseLong(paramMap.get("lateAlarmThreshold").toString()));
54 
        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?0:Long.parseLong(paramMap.get("earlyExitAlarmThreshold").toString()));
55 
        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?0:Long.parseLong(paramMap.get("absentAlarmThreshold").toString()));
56 
        Long workTaskSpecId = null;
57 
        if(!(paramMap.get("workTaskSpecId")==null || StringUtils.isEmpty(paramMap.get("workTaskSpecId").toString()))){
58 
            workTaskSpecId =  paramMap.get("workTaskSpecId")==null?null:Long.parseLong(paramMap.get("workTaskSpecId").toString());
59 
        }
60 
        Long workTaskSpecPlanId = null;
61 
        if(!(paramMap.get("workTaskSpecPlanId")==null || StringUtils.isEmpty(paramMap.get("workTaskSpecPlanId").toString()))){
62 
            workTaskSpecPlanId =  paramMap.get("workTaskSpecPlanId")==null?null:Long.parseLong(paramMap.get("workTaskSpecPlanId").toString());
63 
        }
64 
        Long workShiftId = null;
65 
        if(!(paramMap.get("workShiftId")==null || StringUtils.isEmpty(paramMap.get("workShiftId").toString()))){
66 
            workShiftId =  paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId").toString());
67 
        }
68 
        String orgId = null;
69 
        if(!(paramMap.get("workOrgRoleId")==null || StringUtils.isEmpty(paramMap.get("workOrgRoleId").toString()))){
70 
            orgId =  paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId").toString();
71 
        }
72
73 
        attendanceTaskSpec.setWorkTaskSpecId(workTaskSpecId);
75 74 
        attendanceTaskSpec.setWorkTaskSpecTypeId(AttendanceTaskSpec.WORK_TASK_SPEC_TYPE_CLOCKING);
76 75 
        attendanceTaskSpec.setName(paramMap.get("name")==null?null:(String)paramMap.get("name"));
77 
        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?null:(String)paramMap.get("charValueSet"));
78 
//        "workTaskSpecPlan":{
79 
//            "workOrgRoleId": "1",
80 
//            "planMemo": "测试计划",
81 
//            "planCycleType": "NAT_MON",
82 
//            "workShiftId": 0
83 
//        }
76 
        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?"":(String)paramMap.get("charValueSet"));
84 77 
        WorkTaskSpecPlan workTaskSpecPlan = new WorkTaskSpecPlan();
85 78
86 
        workTaskSpecPlan.setWorkOrgRoleId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId").toString());
79 
        if(paramMap.get("workOrgRoleId")==null){
80 
            new BaseException("workOrgRoleId不能为空！");
81 
        }
82 
        workTaskSpecPlan.setWorkOrgRoleId(orgId);
87 83 
        workTaskSpecPlan.setPlanMemo(paramMap.get("planMemo")==null?null:paramMap.get("planMemo").toString());
88 84 
        String planCycleType = paramMap.get("planCycleType")==null?WorkTaskSpecPlan.PLAN_CYCLE_TYPE_NATURE_MONTH:paramMap.get("planCycleType").toString();
89 85 
        try {
 
@ -103,10 +99,10 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
103 99 
                    startDate =  simpleDateFormat.parse(getThisMonth()+"-"+monthStartMap.get("day"));
104 100 
                }
105 101 
                if("0".equals(monthEndMap.get("type").toString())){
106 
                    endDate =  simpleDateFormat.parse(getThisMonth()+"-"+monthStartMap.get("day"));
102 
                    endDate =  simpleDateFormat.parse(getThisMonth()+"-"+monthEndMap.get("day"));
107 103 
                }
108 104 
                if("1".equals(monthEndMap.get("type").toString())){
109 
                    endDate =  simpleDateFormat.parse(getNextMonth()+"-"+monthStartMap.get("day"));
105 
                    endDate =  simpleDateFormat.parse(getNextMonth()+"-"+monthEndMap.get("day"));
110 106 
                }
111 107 
                workTaskSpecPlan.setBeginTime(startDate);
112 108 
                workTaskSpecPlan.setEndTime(endDate);
 
@ -116,21 +112,30 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
116 112 
        }
117 113
118 114 
        workTaskSpecPlan.setPlanCycleType(planCycleType);
119 
        workTaskSpecPlan.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId").toString()));
115 
        workTaskSpecPlan.setWorkShiftId(workShiftId);
116 
        workTaskSpecPlan.setWorkTaskSpecId(workTaskSpecId);
117 
        workTaskSpecPlan.setWorkTaskSpecPlanId(workTaskSpecPlanId);
120 118
121 119 
        WorkShift workShift = new WorkShift();
122 
        workShift.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId").toString()));
123 
        workShift.setWorkOrgId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId").toString());
120 
        workShift.setWorkShiftId(workShiftId);
121 
//        workShift.setWorkOrgId(orgId);
124 122
125 123 
        AttendanceRuleParams attendanceRuleParams = new AttendanceRuleParams(workTaskSpecPlan,  attendanceTaskSpec,  workShift);
126 124
127 
//        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
128 
        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
125 
        if(workTaskSpecId!=null){
126 
            attendanceCommand.modifyAttendanceRule(new CommonRequest<>(attendanceRuleParams));
127 
        }else {
128 
            attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
129 
        }
130 
        AttendanceRuleDto attendanceRuleDto = new AttendanceRuleDto();
131 
        attendanceRuleDto.setOrgId(orgId);
132 
        attendanceRuleDto = this.queryAttendanceRuleByWorkOrgId(attendanceRuleDto);
133 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(attendanceRuleDto, true));
129 134 
//        return runningResult;
130 
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
131 
        return runningResult;
135 
        return attendanceRuleDto;
132 136 
    }
133 137
138
134 139 
    public static String getLastMonth() {
135 140 
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
136 141 
        Date date = new Date();
 
@ -168,140 +173,140 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
168 173 
        System.out.println(getThisMonth());
169 174 
    }
170 175
171 
        @Override
172 
    public CommonResponse modifyAttendanceRule(Map<String,String> paramMap) throws Exception {
173
174 
        AttendanceTaskSpec attendanceTaskSpec = new AttendanceTaskSpec();
175
176 
        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
177 
        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkPostponeMinutes")));
178 
        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?null:Long.parseLong(paramMap.get("goToWorkDeadLine")));
179 
        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkAheadMinutes")));
180 
        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes")));
181 
        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
182 
        attendanceTaskSpec.setAllowFieldClocking(paramMap.get("goToWorkAheadMinutes")==null?null:paramMap.get("goToWorkAheadMinutes"));
183 
        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?null:Long.parseLong(paramMap.get("lateAlarmThreshold")));
184 
        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?null:Long.parseLong(paramMap.get("earlyExitAlarmThreshold")));
185 
        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
186 
        attendanceTaskSpec.setWorkTaskSpecId(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
187 
//        attendanceTaskSpec.setWorkTaskSpecTypeId(paramMap.get("workTaskSpecTypeId")==null?"CLOCKING":paramMap.get("workTaskSpecTypeId"));
188 
        attendanceTaskSpec.setWorkTaskSpecTypeId("CLOCKING");
189 
        attendanceTaskSpec.setName(paramMap.get("name")==null?null:paramMap.get("name"));
190 
        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?null:paramMap.get("charValueSet"));
191 
//        "workTaskSpecPlan":{
192 
//            "workOrgRoleId": "1",
193 
//            "planMemo": "测试计划",
194 
//            "planCycleType": "NAT_MON",
195 
//            "workShiftId": 0
176 
//        @Override
177 
//    public CommonResponse modifyAttendanceRule(Map<String,String> paramMap) throws Exception {
178 
//
179 
//        AttendanceTaskSpec attendanceTaskSpec = new AttendanceTaskSpec();
180 
//
181 
//        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
182 
//        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkPostponeMinutes")));
183 
//        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?null:Long.parseLong(paramMap.get("goToWorkDeadLine")));
184 
//        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkAheadMinutes")));
185 
//        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes")));
186 
//        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
187 
//        attendanceTaskSpec.setAllowFieldClocking(paramMap.get("goToWorkAheadMinutes")==null?null:paramMap.get("goToWorkAheadMinutes"));
188 
//        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?null:Long.parseLong(paramMap.get("lateAlarmThreshold")));
189 
//        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?null:Long.parseLong(paramMap.get("earlyExitAlarmThreshold")));
190 
//        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
191 
//        attendanceTaskSpec.setWorkTaskSpecId(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
192 
////        attendanceTaskSpec.setWorkTaskSpecTypeId(paramMap.get("workTaskSpecTypeId")==null?"CLOCKING":paramMap.get("workTaskSpecTypeId"));
193 
//        attendanceTaskSpec.setWorkTaskSpecTypeId("CLOCKING");
194 
//        attendanceTaskSpec.setName(paramMap.get("name")==null?null:paramMap.get("name"));
195 
//        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?null:paramMap.get("charValueSet"));
196 
////        "workTaskSpecPlan":{
197 
////            "workOrgRoleId": "1",
198 
////            "planMemo": "测试计划",
199 
////            "planCycleType": "NAT_MON",
200 
////            "workShiftId": 0
201 
////        }
202 
//        WorkTaskSpecPlan workTaskSpecPlan = new WorkTaskSpecPlan();
203 
//
204 
//        workTaskSpecPlan.setWorkOrgRoleId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
205 
//        workTaskSpecPlan.setPlanMemo(paramMap.get("planMemo")==null?null:paramMap.get("planMemo"));
206 
//        workTaskSpecPlan.setPlanCycleType(paramMap.get("planCycleType")==null?null:paramMap.get("planCycleType"));
207 
//        String planCycleType = paramMap.get("planCycleType")==null?"NAT_MON":paramMap.get("planCycleType");
208 
//        if(!planCycleType.equals("NAT_MON")){
209 
//
210 
//            Date beginTimeDate = new Date(paramMap.get("beginTime"));
211 
//            Date endTimeDate = new Date(paramMap.get("endTime"));
212 
//
213 
//            workTaskSpecPlan.setBeginTime(beginTimeDate);
214 
//            workTaskSpecPlan.setEndTime(endTimeDate);
196 215 
//        }
197 
        WorkTaskSpecPlan workTaskSpecPlan = new WorkTaskSpecPlan();
198
199 
        workTaskSpecPlan.setWorkOrgRoleId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
200 
        workTaskSpecPlan.setPlanMemo(paramMap.get("planMemo")==null?null:paramMap.get("planMemo"));
201 
        workTaskSpecPlan.setPlanCycleType(paramMap.get("planCycleType")==null?null:paramMap.get("planCycleType"));
202 
        String planCycleType = paramMap.get("planCycleType")==null?"NAT_MON":paramMap.get("planCycleType");
203 
        if(!planCycleType.equals("NAT_MON")){
204
205 
            Date beginTimeDate = new Date(paramMap.get("beginTime"));
206 
            Date endTimeDate = new Date(paramMap.get("endTime"));
207
208 
            workTaskSpecPlan.setBeginTime(beginTimeDate);
209 
            workTaskSpecPlan.setEndTime(endTimeDate);
210 
        }
211 
        workTaskSpecPlan.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
212
213 
        WorkShift workShift = new WorkShift();
214 
        workShift.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
215 
        workShift.setWorkOrgId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
216
217 
        AttendanceRuleParams attendanceRuleParams = new AttendanceRuleParams(workTaskSpecPlan,  attendanceTaskSpec,  workShift);
218
219 
//        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
220 
//        CommonResponse runningResult =  attendanceCommand.modifyAttendanceRule(neww CommonRequest<>(attendanceRuleParams));
221 
//        return runningResult;
222 
//        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
223 
        return null;
224 
    }
225
226 
    @Override
227 
    public CommonResponse deleteAttendanceRule(Map<String,String> paramMap) throws Exception {
228
229 
        AttendanceTaskSpec attendanceTaskSpec = new AttendanceTaskSpec();
230
231 
//        AttendanceRuleParams
232 
//        "attendanceTaskSpec":{
233 
//            "goToWorkAheadMinutes": 60,
234 
//                    "goToWorkPostponeMinutes": 20,
235 
//                    "goToWorkDeadLine": 60,
236 
//                    "goOffWorkAheadMinutes": 60,
237 
//                    "goOffWorkPostponeMinutes": 10,
238 
//                    "g0OffWorkDeadLine": 30,
239 
//                    "allowFieldClocking": "0",
240 
//                    "lateAlarmThreshold": 5,
241 
//                    "earlyExitAlarmThreshold": 5,
242 
//                    "absentAlarmThreshold": 3,
243 
//                    "workTaskSpecId": "",
244 
//                    "workTaskSpecTypeId": "CLOCKING",
245 
//                    "name": "打卡",
246 
//                    "charValueSet": "{}"
247 
//        },
248 
        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
249 
        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkPostponeMinutes")));
250 
        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?null:Long.parseLong(paramMap.get("goToWorkDeadLine")));
251 
        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkAheadMinutes")));
252 
        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes")));
253 
        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
254 
        attendanceTaskSpec.setAllowFieldClocking(paramMap.get("goToWorkAheadMinutes")==null?null:paramMap.get("goToWorkAheadMinutes"));
255 
        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?null:Long.parseLong(paramMap.get("lateAlarmThreshold")));
256 
        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?null:Long.parseLong(paramMap.get("earlyExitAlarmThreshold")));
257 
        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
258 
        attendanceTaskSpec.setWorkTaskSpecId(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
259 
//        attendanceTaskSpec.setWorkTaskSpecTypeId(paramMap.get("workTaskSpecTypeId")==null?"CLOCKING":paramMap.get("workTaskSpecTypeId"));
260 
        attendanceTaskSpec.setWorkTaskSpecTypeId("CLOCKING");
261 
        attendanceTaskSpec.setName(paramMap.get("name")==null?null:paramMap.get("name"));
262 
        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?null:paramMap.get("charValueSet"));
263 
//        "workTaskSpecPlan":{
264 
//            "workOrgRoleId": "1",
265 
//            "planMemo": "测试计划",
266 
//            "planCycleType": "NAT_MON",
267 
//            "workShiftId": 0
216 
//        workTaskSpecPlan.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
217 
//
218 
//        WorkShift workShift = new WorkShift();
219 
//        workShift.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
220 
//        workShift.setWorkOrgId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
221 
//
222 
//        AttendanceRuleParams attendanceRuleParams = new AttendanceRuleParams(workTaskSpecPlan,  attendanceTaskSpec,  workShift);
223 
//
224 
////        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
225 
////        CommonResponse runningResult =  attendanceCommand.modifyAttendanceRule(neww CommonRequest<>(attendanceRuleParams));
226 
////        return runningResult;
227 
////        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
228 
//        return null;
229 
//    }
230 
//
231 
//    @Override
232 
//    public CommonResponse deleteAttendanceRule(Map<String,String> paramMap) throws Exception {
233 
//
234 
//        AttendanceTaskSpec attendanceTaskSpec = new AttendanceTaskSpec();
235 
//
236 
////        AttendanceRuleParams
237 
////        "attendanceTaskSpec":{
238 
////            "goToWorkAheadMinutes": 60,
239 
////                    "goToWorkPostponeMinutes": 20,
240 
////                    "goToWorkDeadLine": 60,
241 
////                    "goOffWorkAheadMinutes": 60,
242 
////                    "goOffWorkPostponeMinutes": 10,
243 
////                    "g0OffWorkDeadLine": 30,
244 
////                    "allowFieldClocking": "0",
245 
////                    "lateAlarmThreshold": 5,
246 
////                    "earlyExitAlarmThreshold": 5,
247 
////                    "absentAlarmThreshold": 3,
248 
////                    "workTaskSpecId": "",
249 
////                    "workTaskSpecTypeId": "CLOCKING",
250 
////                    "name": "打卡",
251 
////                    "charValueSet": "{}"
252 
////        },
253 
//        attendanceTaskSpec.setGoToWorkAheadMinutes(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
254 
//        attendanceTaskSpec.setGoToWorkPostponeMinutes(paramMap.get("goToWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkPostponeMinutes")));
255 
//        attendanceTaskSpec.setGoToWorkDeadLine(paramMap.get("goToWorkDeadLine")==null?null:Long.parseLong(paramMap.get("goToWorkDeadLine")));
256 
//        attendanceTaskSpec.setGoOffWorkAheadMinutes(paramMap.get("goOffWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkAheadMinutes")));
257 
//        attendanceTaskSpec.setGoOffWorkPostponeMinutes(paramMap.get("goOffWorkPostponeMinutes")==null?null:Long.parseLong(paramMap.get("goOffWorkPostponeMinutes")));
258 
//        attendanceTaskSpec.setGoOffWorkDeadLine(paramMap.get("goToWorkAheadMinutes")==null?null:Long.parseLong(paramMap.get("goToWorkAheadMinutes")));
259 
//        attendanceTaskSpec.setAllowFieldClocking(paramMap.get("goToWorkAheadMinutes")==null?null:paramMap.get("goToWorkAheadMinutes"));
260 
//        attendanceTaskSpec.setLateAlarmThreshold(paramMap.get("lateAlarmThreshold")==null?null:Long.parseLong(paramMap.get("lateAlarmThreshold")));
261 
//        attendanceTaskSpec.setEarlyExitAlarmThreshold(paramMap.get("earlyExitAlarmThreshold")==null?null:Long.parseLong(paramMap.get("earlyExitAlarmThreshold")));
262 
//        attendanceTaskSpec.setAbsentAlarmThreshold(paramMap.get("absentAlarmThreshold")==null?null:Long.parseLong(paramMap.get("absentAlarmThreshold")));
263 
//        attendanceTaskSpec.setWorkTaskSpecId(paramMap.get("workTaskSpecId")==null?null:Long.parseLong(paramMap.get("workTaskSpecId")));
264 
////        attendanceTaskSpec.setWorkTaskSpecTypeId(paramMap.get("workTaskSpecTypeId")==null?"CLOCKING":paramMap.get("workTaskSpecTypeId"));
265 
//        attendanceTaskSpec.setWorkTaskSpecTypeId("CLOCKING");
266 
//        attendanceTaskSpec.setName(paramMap.get("name")==null?null:paramMap.get("name"));
267 
//        attendanceTaskSpec.setCharValueSet(paramMap.get("charValueSet")==null?null:paramMap.get("charValueSet"));
268 
////        "workTaskSpecPlan":{
269 
////            "workOrgRoleId": "1",
270 
////            "planMemo": "测试计划",
271 
////            "planCycleType": "NAT_MON",
272 
////            "workShiftId": 0
273 
////        }
274 
//        WorkTaskSpecPlan workTaskSpecPlan = new WorkTaskSpecPlan();
275 
//
276 
//        workTaskSpecPlan.setWorkOrgRoleId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
277 
//        workTaskSpecPlan.setPlanMemo(paramMap.get("planMemo")==null?null:paramMap.get("planMemo"));
278 
//        workTaskSpecPlan.setPlanCycleType(paramMap.get("planCycleType")==null?null:paramMap.get("planCycleType"));
279 
//        String planCycleType = paramMap.get("planCycleType")==null?"NAT_MON":paramMap.get("planCycleType");
280 
//        if(!planCycleType.equals("NAT_MON")){
281 
//
282 
//            Date beginTimeDate = new Date(paramMap.get("beginTime"));
283 
//            Date endTimeDate = new Date(paramMap.get("endTime"));
284 
//
285 
//            workTaskSpecPlan.setBeginTime(beginTimeDate);
286 
//            workTaskSpecPlan.setEndTime(endTimeDate);
268 287 
//        }
269 
        WorkTaskSpecPlan workTaskSpecPlan = new WorkTaskSpecPlan();
270
271 
        workTaskSpecPlan.setWorkOrgRoleId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
272 
        workTaskSpecPlan.setPlanMemo(paramMap.get("planMemo")==null?null:paramMap.get("planMemo"));
273 
        workTaskSpecPlan.setPlanCycleType(paramMap.get("planCycleType")==null?null:paramMap.get("planCycleType"));
274 
        String planCycleType = paramMap.get("planCycleType")==null?"NAT_MON":paramMap.get("planCycleType");
275 
        if(!planCycleType.equals("NAT_MON")){
276
277 
            Date beginTimeDate = new Date(paramMap.get("beginTime"));
278 
            Date endTimeDate = new Date(paramMap.get("endTime"));
279
280 
            workTaskSpecPlan.setBeginTime(beginTimeDate);
281 
            workTaskSpecPlan.setEndTime(endTimeDate);
282 
        }
283 
        workTaskSpecPlan.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
284
285 
        WorkShift workShift = new WorkShift();
286 
        workShift.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
287 
        workShift.setWorkOrgId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
288
289 
        AttendanceRuleParams attendanceRuleParams = new AttendanceRuleParams(workTaskSpecPlan,  attendanceTaskSpec,  workShift);
290
291 
//        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
292 
//        CommonResponse runningResult =  attendanceCommand(new CommonRequest<>(attendanceRuleParams));
293 
//        return runningResult;
294 
//        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
295 
        return null;
296 
    }
288 
//        workTaskSpecPlan.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
289 
//
290 
//        WorkShift workShift = new WorkShift();
291 
//        workShift.setWorkShiftId(paramMap.get("workShiftId")==null?null:Long.parseLong(paramMap.get("workShiftId")));
292 
//        workShift.setWorkOrgId(paramMap.get("workOrgRoleId")==null?null:paramMap.get("workOrgRoleId"));
293 
//
294 
//        AttendanceRuleParams attendanceRuleParams = new AttendanceRuleParams(workTaskSpecPlan,  attendanceTaskSpec,  workShift);
295 
//
296 
////        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
297 
////        CommonResponse runningResult =  attendanceCommand(new CommonRequest<>(attendanceRuleParams));
298 
////        return runningResult;
299 
////        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
300 
//        return null;
301 
//    }
297 302
298 303 
    @Override
299 304 
//    public CommonResponse<AttendanceRuleParams> queryAttendanceRuleByWorkOrgId(AttendanceRuleDto attendanceRuleDto) throws Exception {
300 305 
    public AttendanceRuleDto queryAttendanceRuleByWorkOrgId(AttendanceRuleDto attendanceRuleDto)  {
301 306 
        String orgId  = StringUtils.isEmpty(attendanceRuleDto.getOrgId())?null:attendanceRuleDto.getOrgId();//,attendanceRuleDto.getPageNumber(),attendanceRuleDto.getPageSize()
302 
        int pageNumber = attendanceRuleDto.getPageNumber()==null?1:attendanceRuleDto.getPageNumber();//,attendanceRuleDto.getPageNumber(),attendanceRuleDto.getPageSize()
303 
        int pageSize = attendanceRuleDto.getPageSize()==null?1:attendanceRuleDto.getPageSize();//,attendanceRuleDto.getPageNumber(),attendanceRuleDto.getPageSize()
304 
        CommonRequest<String> workOrgIdRequest = new CommonRequest(orgId,pageNumber,pageSize);
307 
//        int pageNumber = attendanceRuleDto.getPageNumber()==null?1:attendanceRuleDto.getPageNumber();//,attendanceRuleDto.getPageNumber(),attendanceRuleDto.getPageSize()
308 
//        int pageSize = attendanceRuleDto.getPageSize()==null?1:attendanceRuleDto.getPageSize();//,attendanceRuleDto.getPageNumber(),attendanceRuleDto.getPageSize()
309 
        CommonRequest<String> workOrgIdRequest = new CommonRequest(orgId,1,1);
305 310 
        CommonResponse<AttendanceRuleParams> runningResult = attendanceQuery.loadAttendanceRuleByWorkOrgId(workOrgIdRequest);
306 311 
        if(runningResult.getData()!=null){
307 312 
            AttendanceRuleParams attendanceRuleParams = runningResult.getData();
 
@ -327,6 +332,7 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
327 332 
            attendanceRuleDto.setOrgId(workTaskSpecPlan.getWorkOrgRoleId());
328 333 
            attendanceRuleDto.setPlanCycleType(workTaskSpecPlan.getPlanCycleType());
329 334 
            attendanceRuleDto.setPlanMemo(workTaskSpecPlan.getPlanMemo());
335 
            attendanceRuleDto.setWorkTaskSpecPlanId(workTaskSpecPlan.getWorkTaskSpecPlanId());
330 336
331 337 
//            String beginTime = workTaskSpecPlan.getBeginTime()/;
332 338 
            String beginTime =dateToDateStr(workTaskSpecPlan.getBeginTime(),"yyyy-MM");

+ 142 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java
Ver Arquivo 

@ -2,23 +2,33 @@ package com.ai.bss.security.protection.service.impl;
2 2
3 3 
import com.ai.abc.api.model.CommonRequest;
4 4 
import com.ai.abc.api.model.CommonResponse;
5 
import com.ai.abc.exception.BaseException;
5 6 
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
6 7 
import com.ai.bss.components.common.model.PageBean;
8 
import com.ai.bss.infrastructure.util.CommonUtils;
7 9 
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
8 10 
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
9 11 
import com.ai.bss.security.protection.util.EbcConstant;
10 12 
import com.ai.bss.work.attendance.service.api.ApprovalTaskQuery;
11 13 
import com.alibaba.fastjson.JSONObject;
12 14
15 
import lombok.extern.slf4j.Slf4j;
16 
import org.apache.commons.lang.StringUtils;
13 17 
import org.springframework.beans.factory.annotation.Autowired;
18 
import org.springframework.dao.DataIntegrityViolationException;
14 19 
import org.springframework.stereotype.Service;
15 20 
import org.springframework.util.CollectionUtils;
21 
import org.springframework.web.multipart.MultipartFile;
16 22
23 
import java.io.BufferedReader;
24 
import java.io.IOException;
25 
import java.io.InputStreamReader;
17 26 
import java.util.ArrayList;
18 27 
import java.util.HashMap;
19 28 
import java.util.List;
20 29 
import java.util.Map;
21 30
31 
@Slf4j
22 32 
@Service
23 33 
public class WorkOrderManagementServiceImpl implements WorkOrderManagementService {
24 34 
@ -110,7 +120,138 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
110 120
111 121 
        return response;
112 122 
    }
113
123
124
125 
    @Override
126 
    public CommonResponse importAskLeaveOrder(MultipartFile file)  {
127 
        List<String> listTerminal = getFileData(file);
128
129 
        saveAskLeaveOrder(listTerminal, file.getOriginalFilename());
130
131 
        return CommonResponse.OK_VOID;
132 
    }
133
134 
    private List<String> getFileData(MultipartFile file)
135 
    {
136 
        List<String> dataList = new ArrayList<String>();
137 
        BufferedReader br = null;
138 
        try(InputStreamReader reader=new InputStreamReader(file.getInputStream(), "gb2312"))
139 
        {
140 
            br = new BufferedReader(reader);
141 
            String line = "";
142 
            while((line = br.readLine()) != null)
143 
            {
144 
                dataList.add(line);
145 
            }
146 
        }catch(Exception e){
147 
            log.error("读取文件数据失败: ", e);
148 
            throw new BaseException("读取文件数据失败：", e.getMessage());
149 
        }finally{
150 
            try
151 
            {
152 
                if(null!=br){
153 
                    br.close();
154 
                    br = null;
155 
                }
156 
            }catch(IOException e)
157 
            {
158 
                log.error("close reader exception: ", e);
159 
            }
160 
        }
161 
        return dataList;
162 
    }
163
164 
    private static int terminalInfoArrayLength = 6;
165 
    private void saveAskLeaveOrder(List<String> dataList, String fileName)
166 
    {
167 
//        Long totalCount = (long)dataList.size()-1;
168 
//
169 
//        String data = null;
170 
//        String[] terminalInfo = null;
171 
//        ResourceSpec resourceSpec = null;
172 
////        Customer customer = null;
173 
//        if (dataList != null && !dataList.isEmpty())
174 
//        {
175 
//            for(int i = 1; i < dataList.size(); i++)
176 
//            {
177 
//                data = dataList.get(i);
178 
//                try {
179 
//                    terminalInfo  = terminalInfoTrim( data,terminalInfoArrayLength);
180 
//
181 
//                    if(terminalInfo[index0]==null|| StringUtils.isEmpty(terminalInfo[index0].trim())){
182 
//                        //设备名称不能为空
183 
//                        generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, TerminalConsts.ESSENTIAL_TERMINALNAME_ERROR, "");
184 
//                        failedCount++;
185 
//                        continue;
186 
//                    }
187 
//                    if(terminalInfo[index1]==null||StringUtils.isEmpty(terminalInfo[index1].trim())){
188 
//                        //产品ID不能为空
189 
//                        generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, TerminalConsts.ESSENTIAL_RESOURCEID_ERROR, "");
190 
//                        failedCount++;
191 
//                        continue;
192 
//                    }
193 
//                    if(terminalInfo[index2]==null||StringUtils.isEmpty(terminalInfo[index2].trim())){
194 
//                        //设备序列号不能为空
195 
//                        generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, TerminalConsts.ESSENTIAL_TERMINALSN_ERROR, "");
196 
//                        failedCount++;
197 
//                        continue;
198 
//                    }
199 
//                    //检查产品ID的合法性
200 
//                    if(!CommonUtils.isInteger(terminalInfo[index1])){
201 
//                        //产品ID不是数字
202 
//                        generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, TerminalConsts.RESOURCE_FOMART_ERROR, "");
203 
//                        failedCount++;
204 
//                        continue;
205 
//                    }
206 
//                    //验证产品ID有效性
207 
//                    resourceSpec = this.resourceSpecService.findResourceSpecSimpleBySpecId(Long.parseLong(terminalInfo[index1]));
208 
//                    if(resourceSpec==null){
209 
//                        //系统中查不到该产品
210 
//                        generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, TerminalConsts.FIND_RESOURCE_FAILED, "");
211 
//                        failedCount++;
212 
//                        continue;
213 
//                    }
214 
//
215 
//                    saveTerminalFromImport(terminalInfo,data,logId,null);
216 
//                } catch(DataIntegrityViolationException d){
217 
//                    catchIdxException(d,logId,data);
218 
//                }catch (Exception ex) {
219 
//                    log.error("saveTerminalInfo error: ", ex);
220 
//                    String errMsg = ex.getMessage();
221 
//                    if (errMsg.length() >= errMsgLength) {
222 
//                        errMsg = errMsg.substring(0,errMsgLength-1);
223 
//                    }
224 
//                    generateImportDetailLog(logId, data, ImportConsts.IMPORT_RESULT_FAILED, errMsg, "");
225 
//                    failedCount++;
226 
//                }
227 
//            }
228 
//        }
229 
//
230 
//        importLog.setName(fileName);
231 
//        importLog.setLogType(ImportConsts.LOG_TYPE_IMPORT_TERMINAL);
232 
//        importLog.setTotalCount(totalCount);
233 
//        importLog.setSuccessCount(sucessCount);
234 
//        importLog.setFailedCount(failedCount);
235 
//        if (failedCount == 0) {
236 
//            importLog.setStatus(ImportConsts.IMPORT_RESULT_SUCCESS);
237 
//        } else {
238 
//            importLog.setStatus(ImportConsts.IMPORT_RESULT_FAILED);
239 
//        }
240 
//        importLog = importLogService.saveImportLog(importLog);
241 
//
242 
//        return importLog;
243
244 
    }
245
246
247 
    private String[]  terminalInfoTrim(String data,int arrayLength){
248 
        String[] terminalInfo = new String[arrayLength];
249 
        String[] temp = data.split(",");
250 
        for (int j=0;j<temp.length;j++){
251 
            terminalInfo[j]=temp[j].trim();
252 
        }
253 
        return terminalInfo;
254 
    }
114 255
115 256
116 257

+ 5 - 5
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceRulesService.java
Ver Arquivo 

@ -9,12 +9,12 @@ import java.util.Map;
9 9
10 10 
public interface AttendanceRulesService {
11 11
12 
    CommonResponse createAttendanceRule(Map<String,Object> paramsMap) throws Exception;
12 
    AttendanceRuleDto createAttendanceRule(Map<String,Object> paramsMap) throws Exception;
13 13
14 
    CommonResponse modifyAttendanceRule(Map<String,String> paramsMap) throws Exception;
15
16 
    CommonResponse deleteAttendanceRule(Map<String,String> paramsMap) throws Exception;
14 
//    CommonResponse modifyAttendanceRule(Map<String,String> paramsMap) throws Exception;
15 
//
16 
//    CommonResponse deleteAttendanceRule(Map<String,String> paramsMap) throws Exception;
17 17
18 18 
//    CommonResponse<AttendanceRuleParams> queryAttendanceRuleByWorkOrgId(int pageNumber,int pageSize,String orgId) throws Exception;
19 
AttendanceRuleDto queryAttendanceRuleByWorkOrgId(AttendanceRuleDto attendanceRuleDto) throws Exception;
19 
    AttendanceRuleDto queryAttendanceRuleByWorkOrgId(AttendanceRuleDto attendanceRuleDto) throws Exception;
20 20 
}

+ 4 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkOrderManagementService.java
Ver Arquivo 

@ -2,6 +2,7 @@ package com.ai.bss.security.protection.service.interfaces;
2 2
3 3 
import com.ai.abc.api.model.CommonResponse;
4 4 
import com.ai.bss.components.common.model.PageBean;
5 
import org.springframework.web.multipart.MultipartFile;
5 6
6 7 
import java.util.List;
7 8 
import java.util.Map;
 
@ -33,6 +34,9 @@ public interface WorkOrderManagementService {
33 34 
	 */
34 35 
	 CommonResponse<Map<String, Object>> queryOneWorkOrder(Map<String,String> params) throws Exception;
35 36
37
38 
	 CommonResponse importAskLeaveOrder(MultipartFile file) ;
39
36 40
37 41
38 42