zzx 2 tahun lalu
induk
melakukan
36a4fb7caa

+ 25 - 22
src/main/java/com/galaxis/manatee/controller/ChuanyunTestController.java

@@ -24,7 +24,6 @@ import java.util.List;
  */
 @RestController
 public class ChuanyunTestController {
-
     private final ChuanYunManager chuanYunManager;
     private final EntityManager entityManager;
 
@@ -38,65 +37,69 @@ public class ChuanyunTestController {
      */
     @GetMapping("/testEntity")
     public void test() throws JsonProcessingException {
-        Session session=entityManager.unwrap(Session.class);
-        List<?> testList=session.createSQLQuery("select * from baba").list();
-        ObjectMapper objectMapper=new ObjectMapper();
+        Session session = entityManager.unwrap(Session.class);
+        List<?> testList = session.createSQLQuery("select * from baba").list();
+        ObjectMapper objectMapper = new ObjectMapper();
         System.out.println(objectMapper.writeValueAsString(testList));
     }
 
     /**
      * 单条查询测试
-     * @return  测试结果
+     *
+     * @return 测试结果
      */
     @GetMapping("/chuanyunTest/testFind")
     public String testFind() throws JsonProcessingException {
-        ObjectMapper objectMapper=new ObjectMapper();
-        ChuanyunFindBizDTO<ProjectLogDO> logTemplateChuanYunFindResponse =chuanYunManager.find(ProjectLogDO.SCHEMA_CODE,"ae5f74e9-a8f8-4d20-9e94-b594e57c12bc");
+        ObjectMapper objectMapper = new ObjectMapper();
+        ChuanyunFindBizDTO<ProjectLogDO> logTemplateChuanYunFindResponse = chuanYunManager.find(ProjectLogDO.SCHEMA_CODE, "ae5f74e9-a8f8-4d20-9e94-b594e57c12bc");
         return objectMapper.writeValueAsString(logTemplateChuanYunFindResponse);
     }
 
     /**
      * 单条查询测试
-     * @return  测试结果
+     *
+     * @return 测试结果
      */
     @GetMapping("/chuanyunTest/testFindList")
     public String testFindList() throws JsonProcessingException {
-        ObjectMapper objectMapper=new ObjectMapper();
-        Filter testFilter=Filter.instance(0,20,true);
-        ChuanyunFindAllBizDTO<ChuanyunProjectDO> logTemplateChuanYunFindAllResponse =chuanYunManager.findAll(ChuanyunProjectDO.SCHEMA_CODE,testFilter);
+        ObjectMapper objectMapper = new ObjectMapper();
+        Filter testFilter = Filter.instance(0, 20, true);
+        ChuanyunFindAllBizDTO<ChuanyunProjectDO> logTemplateChuanYunFindAllResponse = chuanYunManager.findAll(ChuanyunProjectDO.SCHEMA_CODE, testFilter);
         return objectMapper.writeValueAsString(logTemplateChuanYunFindAllResponse);
     }
 
     /**
      * 保存测试
-     * @return  保存结果
+     *
+     * @return 保存结果
      */
     @GetMapping("/chuanyunTest/testSave")
     public String testSave() throws JsonProcessingException, BigSizeException {
-        MaterialResendBO resendVO=new MaterialResendBO();
+        MaterialResendBO resendVO = new MaterialResendBO();
         resendVO.setRequestDate(LocalDate.now());
         resendVO.setRequestType("test");
-        ObjectMapper objectMapper=new ObjectMapper();
-        ChuanyunSaveDTO chuanyunSaveResponse= chuanYunManager.save(MaterialResendBO.SCHEMA_CODE,objectMapper.writeValueAsString(resendVO),true);
+        ObjectMapper objectMapper = new ObjectMapper();
+        ChuanyunSaveDTO chuanyunSaveResponse = chuanYunManager.save(MaterialResendBO.SCHEMA_CODE, objectMapper.writeValueAsString(resendVO), true);
         return objectMapper.writeValueAsString(chuanyunSaveResponse);
     }
 
     /**
      * 保存所有
-     * @return  保存结果
-     * @throws JsonProcessingException  json处理异常
+     *
+     * @return 保存结果
+     * @throws JsonProcessingException json处理异常
      */
     @GetMapping("/chuanyunTest/testSaveAll")
     public String testSaveAll() throws JsonProcessingException, BigSizeException {
-        MaterialResendBO resend1=new MaterialResendBO();
-        MaterialResendBO resend2=new MaterialResendBO();
+        MaterialResendBO resend1 = new MaterialResendBO();
+        MaterialResendBO resend2 = new MaterialResendBO();
         resend1.setRequestType("helloChuanyunSaveAll1");
         resend2.setRequestType("helloChuanyunSaveAll2");
-        ObjectMapper objectMapper=new ObjectMapper();
-        List<String> strings=new ArrayList<>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        List<String> strings = new ArrayList<>();
         strings.add(objectMapper.writeValueAsString(resend1));
         strings.add(objectMapper.writeValueAsString(resend2));
-        ChuanyunSaveAllDTO chuanyunSaveAllResponse= chuanYunManager.saveAll(MaterialResendBO.SCHEMA_CODE,strings,true);
+        ChuanyunSaveAllDTO chuanyunSaveAllResponse = chuanYunManager.saveAll(MaterialResendBO.SCHEMA_CODE, strings, true);
         return objectMapper.writeValueAsString(chuanyunSaveAllResponse);
     }
 }

+ 5 - 10
src/main/java/com/galaxis/manatee/controller/ClawController.java

@@ -22,19 +22,18 @@ import java.util.Map;
 @RestController
 @Slf4j
 public class ClawController {
-
     private final ClawFeign clawFeign;
 
-
     public ClawController(ClawFeign clawFeign) {
         this.clawFeign = clawFeign;
     }
 
     /**
      * 接口调用异常
+     *
      * @param exception 系统抛出异常
      * @param request   客户端请求
-     * @return  返回结果
+     * @return 返回结果
      */
     @ExceptionHandler(value = {Exception.class})
     public ResponseEntity<Exception> vehicleNotFound(Exception exception, WebRequest request) {
@@ -45,13 +44,9 @@ public class ClawController {
     }
 
     @GetMapping("/test/claw")
-    public Page<ChuanyunProjectDTO> test(){
-        Map<String,String> map=new HashMap<>(1);
-        map.put("projectCode_eq","a00001");
+    public Page<ChuanyunProjectDTO> test() {
+        Map<String, String> map = new HashMap<>(1);
+        map.put("projectCode_eq", "a00001");
         return clawFeign.findChuanyunProjectPageable(map);
     }
-
-//    public List<ChuanyunProjectDTO> test1(){
-//
-//    }
 }

+ 6 - 7
src/main/java/com/galaxis/manatee/controller/DataStructureTestController.java

@@ -19,7 +19,6 @@ import java.util.Optional;
 @Slf4j
 @RestController
 public class DataStructureTestController {
-
     private final DingTalkProcessInstanceDao dingTalkProcessInstanceDao;
 
     public DataStructureTestController(DingTalkProcessInstanceDao dingTalkProcessInstanceDao) {
@@ -27,11 +26,11 @@ public class DataStructureTestController {
     }
 
     @GetMapping("/testData")
-    public void testData(){
-        Optional<DingTalkProcessInstance> dingTalkProcessInstance=dingTalkProcessInstanceDao.findById("774cd621-e754-4893-8d84-e1fc96fc5e2c");
-        Assert.isTrue(dingTalkProcessInstance.isPresent(),"dingTalkProcessInstance is null");
-        OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo=dingTalkProcessInstance.get().getProcessInstance();
-        List<OapiProcessinstanceGetResponse.FormComponentValueVo> list= processInstanceTopVo.getFormComponentValues();
-        list.forEach(a->log.info(a.getName()+"///"+a.getValue()));
+    public void testData() {
+        Optional<DingTalkProcessInstance> dingTalkProcessInstance = dingTalkProcessInstanceDao.findById("774cd621-e754-4893-8d84-e1fc96fc5e2c");
+        Assert.isTrue(dingTalkProcessInstance.isPresent(), "dingTalkProcessInstance is null");
+        OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo = dingTalkProcessInstance.get().getProcessInstance();
+        List<OapiProcessinstanceGetResponse.FormComponentValueVo> list = processInstanceTopVo.getFormComponentValues();
+        list.forEach(a -> log.info(a.getName() + "///" + a.getValue()));
     }
 }

+ 11 - 11
src/main/java/com/galaxis/manatee/controller/DingTalkTestController.java

@@ -24,13 +24,13 @@ import java.util.Map;
 @RequestMapping("/dingTalkTest")
 @RestController
 public class DingTalkTestController {
-
-
     private final ObjectMapper objectMapper;
     private final DingTalkRobotDao dingTalkRobotDao;
     private final DingTalkRobotWebHook dingTalkRobotWebHook;
 
-    public DingTalkTestController(ObjectMapper objectMapper, DingTalkRobotDao dingTalkRobotDao, DingTalkRobotWebHook dingTalkRobotWebHook) {
+    public DingTalkTestController(ObjectMapper objectMapper,
+                                  DingTalkRobotDao dingTalkRobotDao,
+                                  DingTalkRobotWebHook dingTalkRobotWebHook) {
         this.objectMapper = objectMapper;
         this.dingTalkRobotDao = dingTalkRobotDao;
         this.dingTalkRobotWebHook = dingTalkRobotWebHook;
@@ -38,15 +38,16 @@ public class DingTalkTestController {
 
     /**
      * 测试中兴机器人
+     *
      * @throws Exception 机器人接口调用异常
      */
     @GetMapping("/dingTalkRobotWebHookTest")
     public void dingTalkRobotWebHookTest() throws Exception {
-        Map<String,String> params=new HashMap<>(1);
-        params.put("content","考勤报告,这是测试");
-        DingTalkRobotRequest.At at=DingTalkRobotRequest.At.instance(new ArrayList<>(),false);
-        DingTalkRobot dingTalkRobot=dingTalkRobotDao.findByName("中兴关键词机器人");
-        DingTalkRobotResponse dingTalkRobotResponse=dingTalkRobotWebHook.invoke(DingTalkRobotRequest.instanceOf(params, DingTalkRobotRequest.MessageType.TEXT,at),dingTalkRobot);
+        Map<String, String> params = new HashMap<>(1);
+        params.put("content", "考勤报告,这是测试");
+        DingTalkRobotRequest.At at = DingTalkRobotRequest.At.instance(new ArrayList<>(), false);
+        DingTalkRobot dingTalkRobot = dingTalkRobotDao.findByName("中兴关键词机器人");
+        DingTalkRobotResponse dingTalkRobotResponse = dingTalkRobotWebHook.invoke(DingTalkRobotRequest.instanceOf(params, DingTalkRobotRequest.MessageType.TEXT, at), dingTalkRobot);
         log.info(objectMapper.writeValueAsString(dingTalkRobotResponse));
     }
 
@@ -54,10 +55,9 @@ public class DingTalkTestController {
      * 测试保存
      */
     @GetMapping("/saveDingTalkRobot")
-    public void saveDingTalkRobot(){
-        DingTalkRobot dingTalkRobot=new DingTalkRobot();
+    public void saveDingTalkRobot() {
+        DingTalkRobot dingTalkRobot = new DingTalkRobot();
         dingTalkRobot.setName("测试创建");
         dingTalkRobotDao.save(dingTalkRobot);
     }
-
 }

+ 5 - 3
src/main/java/com/galaxis/manatee/controller/EquipmentController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/equipment")
 public class EquipmentController {
-
     private final ChuanyunService chuanyunService;
 
     public EquipmentController(ChuanyunService chuanyunService) {
@@ -21,10 +20,13 @@ public class EquipmentController {
 
     /**
      * 更新小车信息
+     *
      * @param chuanyunOperationInformationDO
      */
     @PostMapping("/updateEquipment")
-    public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO){
+    public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO) {
         chuanyunService.updateOperationInformation(chuanyunOperationInformationDO);
-    };
+    }
+
+    ;
 }

+ 4 - 3
src/main/java/com/galaxis/manatee/controller/ExcelController.java

@@ -22,7 +22,6 @@ import java.util.List;
 @RestController
 @Slf4j
 public class ExcelController {
-
     private final ChuanyunUserDao chuanyunUserDao;
     private final ChuanyunProjectAttachmentDao chuanyunProjectAttachmentDao;
 
@@ -31,12 +30,14 @@ public class ExcelController {
         this.chuanyunProjectAttachmentDao = chuanyunProjectAttachmentDao;
     }
 
-
     @ResponseBody
     @RequestMapping(value = "/test/exportExcel", method = RequestMethod.GET)
     public void exportExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
         List<ChuanyunProjectAttachmentDO> list = chuanyunProjectAttachmentDao.findAll();
-        String[] title = {"项目名称", "项目编号", "物料名称", "图片", "英文名","零件归属","数量","单位","未税单价","易耗件","系数","汇率","总价","备注"};
+        String[] title = {
+                "项目名称", "项目编号", "物料名称", "图片", "英文名", "零件归属", "数量",
+                "单位", "未税单价", "易耗件", "系数", "汇率", "总价", "备注"
+        };
         String filename = "testRecord.xls";
         String sheetName = "sheet1";
         String[][] content = new String[list.size()][20];

+ 13 - 13
src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -18,6 +18,7 @@ import java.util.List;
 
 /**
  * 提供手工触发更新氚云数据的接口
+ *
  * @author zcj
  * @version 0.1
  * @date 2020/6/7 10:26 上午
@@ -25,12 +26,13 @@ import java.util.List;
 @RestController
 @Slf4j
 public class GetController {
-
     private final ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask;
     private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
     private final ChuanyunService chuanyunService;
 
-    public GetController(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunService chuanyunService) {
+    public GetController(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask,
+                         ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask,
+                         ChuanyunService chuanyunService) {
         this.chuanyunHumanResourceScheduledTask = chuanyunHumanResourceScheduledTask;
         this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
         this.chuanyunService = chuanyunService;
@@ -41,7 +43,7 @@ public class GetController {
      */
     @Async
     @GetMapping("/test/getChuanyunPayroll")
-    public void getChuanyunPayroll(){
+    public void getChuanyunPayroll() {
         chuanyunHumanResourceScheduledTask.getPayrollManually();
     }
 
@@ -113,6 +115,7 @@ public class GetController {
 
     /**
      * 获取人员费用归集
+     *
      * @return
      */
     @GetMapping("/test/getAllCostCollection")
@@ -123,6 +126,7 @@ public class GetController {
 
     /**
      * 更新人员所属部门
+     *
      * @param code
      */
     @GetMapping("/test/updateProjectDept")
@@ -132,37 +136,33 @@ public class GetController {
 
     /**
      * 导入设备配置信息
+     *
      * @param file
      */
     @PostMapping("/test/import")
-    public void importEquipment(@RequestParam(value="uploadFile", required = false) MultipartFile file){
+    public void importEquipment(@RequestParam(value = "uploadFile", required = false) MultipartFile file) {
         List<ChuanyunEquipmentDO> list = ExcelUtils.readExcel("", ChuanyunEquipmentDO.class, file);
         chuanyunService.importEquipment(list);
     }
 
     /**
      * 导入产品库信息
+     *
      * @param file
      */
     @PostMapping("/test/importproduct")
-    public void importProductLibrary(@RequestParam(value="uploadFile", required = false) MultipartFile file){
+    public void importProductLibrary(@RequestParam(value = "uploadFile", required = false) MultipartFile file) {
         List<ChuanyunProductDO> list = ExcelUtils.readExcel("", ChuanyunProductDO.class, file);
         chuanyunService.importProduct(list);
     }
 
     /**
      * 更新小车信息
+     *
      * @param chuanyunOperationInformationDO
      */
     @PostMapping("/test/updateEquipment")
-    public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO){
+    public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO) {
         chuanyunService.updateOperationInformation(chuanyunOperationInformationDO);
     }
-
-//    @GetMapping("/test/updateMember")
-//    public void updateMember(){
-//        chuanyunBasicDataScheduledTask.chuanyunUpdateProjectMemberManually();
-//    }
-
-
 }

+ 3 - 7
src/main/java/com/galaxis/manatee/controller/JwtAuthenticationFilter.java

@@ -23,12 +23,12 @@ import static com.auth0.jwt.algorithms.Algorithm.HMAC512;
 
 /**
  * jwt filter for security
+ *
  * @author zcj
  * @version 0.1
  * @date 2020/4/3 3:50 下午
  */
 public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
-
     private final AuthenticationManager authenticationManager;
 
     public JwtAuthenticationFilter(AuthenticationManager authenticationManager) {
@@ -52,11 +52,8 @@ public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilte
     }
 
     @Override
-    protected void successfulAuthentication(HttpServletRequest req,
-                                            HttpServletResponse res,
-                                            FilterChain chain,
-                                            Authentication auth) {
-
+    protected void successfulAuthentication(HttpServletRequest req, HttpServletResponse res,
+                                            FilterChain chain, Authentication auth) {
         String token = JWT.create()
                 .withSubject(((org.springframework.security.core.userdetails.User) auth.getPrincipal()).getUsername())
                 .withExpiresAt(new Date(System.currentTimeMillis() + SecurityConstant.EXPIRATION_TIME))
@@ -69,5 +66,4 @@ public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilte
         response.setStatus(500);
         response.getWriter().println("Login exception! Please check the username and password");
     }
-
 }

+ 5 - 9
src/main/java/com/galaxis/manatee/controller/JwtAuthorizationFilter.java

@@ -26,24 +26,20 @@ import static com.galaxis.manatee.constant.SecurityConstant.TOKEN_PREFIX;
  * @date 2020/4/3 6:00 下午
  */
 public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
-
     public JwtAuthorizationFilter(AuthenticationManager authManager) {
         super(authManager);
     }
 
     @Override
-    protected void doFilterInternal(HttpServletRequest req,
-                                    HttpServletResponse res,
-                                    FilterChain chain) throws IOException, ServletException {
+    protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
         String header = req.getHeader(HEADER_STRING);
-
         if (header == null || !header.startsWith(TOKEN_PREFIX)) {
             chain.doFilter(req, res);
             return;
         }
 
         UsernamePasswordAuthenticationToken authentication = getAuthentication(req);
-
         SecurityContextHolder.getContext().setAuthentication(authentication);
         //刷新token
         String token = JWT.create()
@@ -51,14 +47,14 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
                 .withExpiresAt(new Date(System.currentTimeMillis() + SecurityConstant.EXPIRATION_TIME))
                 .sign(HMAC512(SecurityConstant.SECRET.getBytes()));
         res.addHeader(SecurityConstant.HEADER_STRING, SecurityConstant.TOKEN_PREFIX + token);
-
         chain.doFilter(req, res);
     }
 
     /**
      * This method reads the JWT from the Authorization header, and then uses JWT to validate the token
-     * @param request   请求
-     * @return  认证的token或者认证失败返回null
+     *
+     * @param request 请求
+     * @return 认证的token或者认证失败返回null
      */
     private UsernamePasswordAuthenticationToken getAuthentication(HttpServletRequest request) {
         String token = request.getHeader(HEADER_STRING);

+ 0 - 4
src/main/java/com/galaxis/manatee/controller/ReimbursementController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 public class ReimbursementController {
-
     private ChuanyunFinancialScheduledTask chuanyunFinancialScheduledTask;
     private WorkGroupService workGroupService;
     private U9InfoTask u9InfoTask;
@@ -69,7 +68,4 @@ public class ReimbursementController {
     public void saveLaborCostWg() {
         u9InfoTask.saveLaborCostWgTest();
     }
-
-
-
 }

+ 5 - 14
src/main/java/com/galaxis/manatee/controller/TestController.java

@@ -43,22 +43,20 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 public class TestController {
-
     @Autowired
     private ChuanyunUserCompanyDao chuanyunUserCompanyDao;
-
     private final LogUpdateService logUpdateService;
     private final LogStandardService logStandardService;
     private final LogCheckService logCheckService;
     private final LogService logService;
     private final LogDownloadService logDownloadService;
-
     private final ProjectMemberService projectMemberService;
-
     private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
 
-
-    public TestController(LogUpdateService logUpdateService, LogStandardService logStandardService, LogCheckService logCheckService, LogService logService, LogDownloadService logDownloadService, ProjectMemberService projectMemberService, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask) {
+    public TestController(LogUpdateService logUpdateService, LogStandardService logStandardService,
+                          LogCheckService logCheckService, LogService logService,
+                          LogDownloadService logDownloadService, ProjectMemberService projectMemberService,
+                          ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask) {
         this.logUpdateService = logUpdateService;
         this.logStandardService = logStandardService;
         this.logCheckService = logCheckService;
@@ -187,7 +185,6 @@ public class TestController {
             log.error(e.getMessage());
         }
         log.info("修改" + userId + "工时信息耗时" + (System.currentTimeMillis() - start));
-
     }
 
     /**
@@ -202,7 +199,6 @@ public class TestController {
         logCheckService.checkDayWorkHourTimeAfter(disUserIdList, 90);
         logCheckService.checkWeekWorkHour(disUserIdList);
         logCheckService.checkMonthWorkHour(disUserIdList);
-
     }
 
     /**
@@ -214,6 +210,7 @@ public class TestController {
     public void pullChuanyunLog() {
         logDownloadService.saveChuanyunLogDO(false);
     }
+
     /**
      * 下载工时日志
      *
@@ -253,9 +250,7 @@ public class TestController {
      */
     @GetMapping("/test/api/manual/getGroupProjectForSynchronizationManually")
     public void getGroupProjectForSynchronizationManually() {
-
         chuanyunBasicDataScheduledTask.getGroupProjectForSynchronizationManually();
-
     }
 
     /**
@@ -263,12 +258,8 @@ public class TestController {
      */
     @GetMapping("/test/pushAskForLeave")
     public void pushAskForLeave() {
-
         chuanyunBasicDataScheduledTask.pushAskForLeave();
-
     }
-
-
 }
 
 

+ 0 - 2
src/main/java/com/galaxis/manatee/controller/U9WorkMessageController.java

@@ -23,7 +23,6 @@ import java.util.List;
 @RestController
 @Slf4j
 public class U9WorkMessageController {
-
     @Autowired
     private U9WorkMessageService u9WorkMessageService;
 
@@ -66,5 +65,4 @@ public class U9WorkMessageController {
         u9ResponseMessageDTO.setErrorCode(1L);
         return JSON.toJSONString(u9ResponseMessageDTO);
      }
-
 }

+ 0 - 1
src/main/java/com/galaxis/manatee/controller/UserController.java

@@ -22,7 +22,6 @@ import java.util.Random;
 @RestController
 @RequestMapping("/user")
 public class UserController {
-
     private final UserService userService;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
     private String confirmCode;

+ 0 - 4
src/main/java/com/galaxis/manatee/controller/WorkHourController.java

@@ -26,10 +26,8 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 public class WorkHourController {
-
     @Autowired
     private ChuanyunUserCompanyDao userCompanyDao;
-
     private final LogCheckService logCheckService;
     private final LogStandardService logStandardService;
     private final LogUpdateService logUpdateService;
@@ -115,7 +113,6 @@ public class WorkHourController {
         workHourStatistics.pushWorkHour();
     }
 
-
     /**
      * 检验一个季度的工时日志
      */
@@ -153,5 +150,4 @@ public class WorkHourController {
     public void pushAllWorkHourApi() {
         workHourStatistics.pushAllWorkHour();
     }
-
 }

+ 0 - 3
src/main/java/com/galaxis/manatee/controller/WorkHourOperateController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 public class WorkHourOperateController {
-
     @Autowired
     private LogDownloadService logDownloadService;
     @Autowired
@@ -27,6 +26,4 @@ public class WorkHourOperateController {
         // 保存4月份工时至数据库
         logDownloadService.saveDayLog();
     }
-
-
 }