1.小车信息注册登录获取token

src/main/java/com/galaxis/manatee/configuration/ManateeSecurity.java

@@ -39,6 +39,7 @@ public class ManateeSecurity extends WebSecurityConfigurerAdapter {
         http.cors().and().csrf().disable().authorizeRequests()
                 .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
                 .antMatchers(HttpMethod.GET,GO_CONFIRM).permitAll()
+                .antMatchers(HttpMethod.POST,"/login").permitAll()
                 .antMatchers(HttpMethod.GET,"/test/**").permitAll()
                 .antMatchers(HttpMethod.POST,"/test/**").permitAll()
                 .antMatchers(HttpMethod.GET,"/u9workmessage/**").permitAll()

src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -2,6 +2,7 @@ package com.galaxis.manatee.controller;
 
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostCollectionDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunOperationInformationDO;
 import com.galaxis.manatee.service.ChuanyunService;
 import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import com.galaxis.manatee.task.ChuanyunHumanResourceScheduledTask;
@@ -11,10 +12,7 @@ import net.sf.json.JSON;
 import net.sf.json.JSONObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -143,6 +141,15 @@ public class GetController {
         chuanyunService.importEquipment(list);
     }
 
+    /**
+     * 更新小车信息
+     * @param chuanyunOperationInformationDO
+     */
+    @PostMapping("/test/updateEquipment")
+    public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO){
+        chuanyunService.updateOperationInformation(chuanyunOperationInformationDO);
+    };
+
 //    @GetMapping("/test/updateMember")
 //    public void updateMember(){
 //        chuanyunBasicDataScheduledTask.chuanyunUpdateProjectMemberManually();

src/main/java/com/galaxis/manatee/controller/UserController.java

@@ -30,17 +30,17 @@ public class UserController {
     /**
      * 验证人手机号
      */
-    @Value(("${aliyun.access.mobile}"))
+//    @Value(("${aliyun.access.mobile}"))
     private String mobile;
     /**
      * 验证key的Id
      */
-    @Value(("${aliyun.access.key.id}"))
+//    @Value(("${aliyun.access.key.id}"))
     private String accessKeyId;
     /**
      * 验证key的secret
      */
-    @Value(("${aliyun.access.key.secret}"))
+//    @Value(("${aliyun.access.key.secret}"))
     private String accessKeySecret;
 
     public UserController(UserService userService, BCryptPasswordEncoder bCryptPasswordEncoder) {
@@ -78,11 +78,11 @@ public class UserController {
      */
     @PostMapping("/signUp")
     public ResponseEntity<String> signUp(@RequestBody User user) {
-        if(user.getConfirmCode()==null||!user.getConfirmCode().equals(confirmCode)){
-            return new ResponseEntity<>("验证码信息错误", HttpStatus.NON_AUTHORITATIVE_INFORMATION);
-        }
+//        if(user.getConfirmCode()==null||!user.getConfirmCode().equals(confirmCode)){
+//            return new ResponseEntity<>("验证码信息错误", HttpStatus.NON_AUTHORITATIVE_INFORMATION);
+//        }
         user.setPassword(bCryptPasswordEncoder.encode(user.getPassword()));
         userService.signUp(user);
         return new ResponseEntity<>(null, HttpStatus.OK);
     }
-}
+}

src/main/java/com/galaxis/manatee/dao/ChuanyunOperationInformationDao.java

@@ -0,0 +1,10 @@
+package com.galaxis.manatee.dao;
+
+import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMonthLaborCostDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunOperationInformationDO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChuanyunOperationInformationDao extends GalaxisRepository<ChuanyunOperationInformationDO,String> {
+}

src/main/java/com/galaxis/manatee/entity/User.java

@@ -32,10 +32,10 @@ public class User {
      */
     private String password;
 
-    /**
-     * 验证码
-     */
-    @Transient
-    private String confirmCode;
+//    /**
+//     * 验证码
+//     */
+//    @Transient
+//    private String confirmCode;
 
 }

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunOperationInformationDO.java

@@ -0,0 +1,36 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_OPERATION_INFORMATION")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunOperationInformationDO extends BasicDO{
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="";
+
+    /**
+     * 小车编号
+     */
+    private String equipmentId;
+
+    /**
+     * 设备参数
+     */
+    private String equipmentParameter;
+
+    /**
+     * 设备值
+     */
+    private String equipmentValue;
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunOperationInformationDTO.java

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+import lombok.Data;
+
+@Data
+public class ChuanyunOperationInformationDTO {
+
+    /**
+     * 小车编号
+     */
+    private String equipmentId;
+
+    /**
+     * 设备参数
+     */
+    private String equipmentParameter;
+
+    /**
+     * 设备值
+     */
+    private String equipmentValue;
+}

src/main/java/com/galaxis/manatee/service/ChuanyunService.java

@@ -2,6 +2,8 @@ package com.galaxis.manatee.service;
 
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostCollectionDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunOperationInformationDO;
+import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunOperationInformationDTO;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
@@ -39,4 +41,9 @@ public interface ChuanyunService {
      */
     void updateU9Department();
 
+    /**
+     * 更新小车信息
+     */
+    void updateOperationInformation(ChuanyunOperationInformationDO chuanyunOperationInformationDO);
+
 }

src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -7,10 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.galaxis.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.constant.StringConstant;
-import com.galaxis.manatee.dao.ChuanyunCostCollectionDao;
-import com.galaxis.manatee.dao.ChuanyunEquipmentInformDao;
-import com.galaxis.manatee.dao.ChuanyunGroupProjectDao;
-import com.galaxis.manatee.dao.ChuanyunUserCompanyDao;
+import com.galaxis.manatee.dao.*;
 import com.galaxis.manatee.entity.chuanyun.data.object.*;
 import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunSaveDTO;
 import com.galaxis.manatee.entity.chuanyun.dto.Filter;
@@ -40,14 +37,16 @@ public class ChuanyunServiceImpl implements ChuanyunService {
     private final ChuanyunEquipmentInformDao chuanyunEquipmentInformDao;
     private final ChuanyunGroupProjectDao chuanyunGroupProjectDao;
     private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
+    private final ChuanyunOperationInformationDao chuanyunOperationInformationDao;
 
-    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunEquipmentInformDao chuanyunEquipmentInformDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask) {
+    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunEquipmentInformDao chuanyunEquipmentInformDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunOperationInformationDao chuanyunOperationInformationDao) {
         this.chuanYunManager = chuanYunManager;
         this.chuanyunCostCollectionDao = chuanyunCostCollectionDao;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
         this.chuanyunEquipmentInformDao = chuanyunEquipmentInformDao;
         this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
         this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
+        this.chuanyunOperationInformationDao = chuanyunOperationInformationDao;
     }
 
     @Override
@@ -232,6 +231,11 @@ public class ChuanyunServiceImpl implements ChuanyunService {
         }
     }
 
+    @Override
+    public void updateOperationInformation(ChuanyunOperationInformationDO chuanyunOperationInformationDO) {
+        chuanyunOperationInformationDao.save(chuanyunOperationInformationDO);
+    }
+
     /**
      * 更新外部部门名称
      * @param