修改添加用户接口

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/service/impl/MobileUserServiceImpl.java

@@ -71,9 +71,7 @@ public class MobileUserServiceImpl implements MobileUserService {
     @Autowired
     MobileUnitRepository mobileUnitRepository;
 
-    String ycgApi = mobileUnitRepository.findByShortNameLike("油车港").get(0).getApi();
-    String wyApi = mobileUnitRepository.findByShortNameLike("武义").get(0).getApi();
-    String wjjApi = mobileUnitRepository.findByShortNameLike("王江泾").get(0).getApi();
+
 
     @Override
     public Result add(MobileUser entity){
@@ -81,6 +79,11 @@ public class MobileUserServiceImpl implements MobileUserService {
             return new Result(10002, ResultStatus.addNull);
         }
         try {
+            String ycgApi = mobileUnitRepository.findByShortNameLike("油车港").get(0).getApi();
+            String wyApi = mobileUnitRepository.findByShortNameLike("武义").get(0).getApi();
+            String wjjApi = mobileUnitRepository.findByShortNameLike("王江泾").get(0).getApi();
+
+
             RestTemplate restTemplate  = new RestTemplate();
             Integer id = mobileUserRepository.findID();
             Integer grantClass = entity.getGrantClass();
@@ -103,6 +106,10 @@ public class MobileUserServiceImpl implements MobileUserService {
         if (ids == null || ids.length==0){
             return new Result(10002,ResultStatus.deleteNull);
         }
+        String ycgApi = mobileUnitRepository.findByShortNameLike("油车港").get(0).getApi();
+        String wyApi = mobileUnitRepository.findByShortNameLike("武义").get(0).getApi();
+        String wjjApi = mobileUnitRepository.findByShortNameLike("王江泾").get(0).getApi();
+
 
         RestTemplate restTemplate  = new RestTemplate();
         restTemplate.getForEntity(wjjApi+"/video/mobileUser/remove?ids="+ids,null);

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/controller/MobileApiController.java

@@ -4,6 +4,7 @@ import com.huimv.mobile.domain.MobileApi;
 import com.huimv.mobile.result.Result;
 import com.huimv.mobile.service.MobileApiService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 @RestController
 @RequestMapping("/api")
+@CrossOrigin
 public class MobileApiController {
 
     @Autowired

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/controller/MobileUserController.java

@@ -4,6 +4,7 @@ import com.huimv.mobile.result.Result;
 import com.huimv.mobile.service.MobileUserService;
 import com.huimv.mobile.utils.CheckNumber;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,14 +22,15 @@ import java.io.IOException;
  **/
 @RestController
 @RequestMapping("/mobileUser")
+@CrossOrigin
 public class MobileUserController {
 
     @Autowired
     private MobileUserService userService;
 
-    @RequestMapping("/register")
-    public Result register(String account,String password){
-        return userService.register(account,password);
+    @RequestMapping("/login")
+    public Result login(String account,String password){
+        return userService.login(account,password);
     }
 
 

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/domain/MobileUnit.java

@@ -35,4 +35,10 @@ public class MobileUnit implements Serializable {
     @Column(name = "remark")
     private String remark;
 
+    /**
+     * api
+     */
+    @Column(name = "api")
+    private String api;
+
 }

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/repo/MobileUnitRepository.java

@@ -6,4 +6,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 public interface MobileUnitRepository extends JpaRepository<MobileUnit, Integer>, JpaSpecificationExecutor<MobileUnit> {
 
+
 }

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/service/MobileUserService.java

@@ -10,5 +10,5 @@ import com.huimv.mobile.result.Result;
  * @Create : 2021/4/19 0019 14:23
  **/
 public interface MobileUserService {
-    Result register(String account, String password);
+    Result login(String account, String password);
 }

huimv-mobile-video/huimv-mobile/src/main/java/com/huimv/mobile/service/impl/MobileUserServiceImpl.java

@@ -1,17 +1,21 @@
 package com.huimv.mobile.service.impl;
 
 import com.huimv.mobile.domain.MobileApi;
+import com.huimv.mobile.domain.MobileUnit;
 import com.huimv.mobile.domain.MobileUser;
 import com.huimv.mobile.repo.MobileApiRepository;
+import com.huimv.mobile.repo.MobileUnitRepository;
 import com.huimv.mobile.repo.MobileUserRepository;
 import com.huimv.mobile.result.Result;
 import com.huimv.mobile.service.MobileUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @Project : huimv.shiwan
@@ -27,33 +31,37 @@ public class MobileUserServiceImpl implements MobileUserService {
     private MobileUserRepository userRepository;
 
     @Autowired
-    private MobileApiRepository mobileApiRepository;
+    private MobileUnitRepository mobileUnitRepository;
 
     @Override
-    public Result register(String account, String password) {
+    public Result login(String account, String password) {
 
+        password = DigestUtils.md5DigestAsHex(password.getBytes());
         MobileUser mobileUser = userRepository.findByAccountAndPassword(account, password);
 
         if (mobileUser == null){
             return new Result(10001,"用户名或密码错误");
         }
+        if (mobileUser.getStatus() == 0){
+            return new Result(10001,"该账号已停冻结");
+        }
 
 
 
         Map endMap  = new HashMap();
         Integer grant = mobileUser.getGrantClass();
         if (grant != 3){
-            List<MobileApi> all = mobileApiRepository.findAll();
+            List<MobileUnit> all = mobileUnitRepository.findAll();
             endMap.put("url",all);
             endMap.put("userName",mobileUser.getUserName());
             endMap.put("userId",mobileUser.getId());
             endMap.put("unit",mobileUser.getUnit());
             endMap.put("grant",grant);
         }
-        if (grant == 1 || grant == 2 ){
+        if (grant == 3){
 
-            MobileApi api = mobileApiRepository.findByFarmId(mobileUser.getUnitId());
-            endMap.put("url",api.getUrl());
+            String api =  mobileUnitRepository.findById(mobileUser.getUnitId()).get().getApi();
+            endMap.put("url",api);
             endMap.put("userName",mobileUser.getUserName());
             endMap.put("userId",mobileUser.getId());
             endMap.put("unit",mobileUser.getUnit());