admin

shiwan/admin/src/main/java/com/huimv/admin/analyse/AITest.java

@@ -0,0 +1,33 @@
+package com.huimv.admin.analyse;
+
+import com.huimv.admin.utils.HttpClient;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import javax.servlet.http.HttpUtils;
+import java.util.HashMap;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.analyse
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/26 0026 19:53
+ **/
+
+public class AITest {
+    public static void main(String[] args) throws Exception {
+
+        String access_token_url = "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials" +
+                "&client_id=" + APIConstants.API_KEY
+                + "&client_secret=" + APIConstants.SECRET_KEY;
+
+        HttpClient httpClient = new HttpClient(access_token_url);
+        httpClient.setHttps(false);
+        httpClient.get();
+
+        String content = httpClient.getContent();
+        System.out.println(content);
+
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/analyse/APIConstants.java

@@ -0,0 +1,42 @@
+package com.huimv.admin.analyse;
+
+import com.baidu.aip.face.AipFace;
+import org.json.JSONObject;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.analyse
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/26 0026 19:41
+ **/
+public class APIConstants {
+    //设置APPID/AK/SK
+    public static final String APP_ID = "23396383";
+    public static final String API_KEY = "EiCulalmXcwLlxqicQrlYdxe";
+    public static final String SECRET_KEY = "YYWBzZqyx6CTtzA9ldmfMME85AXMNTlx";
+
+   /* public static void main(String[] args) {
+        // 初始化一个AipFace
+        AipFace client = new AipFace(APP_ID, API_KEY, SECRET_KEY);
+
+        // 可选：设置网络连接参数
+        client.setConnectionTimeoutInMillis(2000);
+        client.setSocketTimeoutInMillis(60000);
+
+        // 可选：设置代理服务器地址, http和socket二选一，或者均不设置
+       // client.setHttpProxy("proxy_host", proxy_port);  // 设置http代理
+       // client.setSocketProxy("proxy_host", proxy_port);  // 设置socket代理
+
+        // 调用接口
+        String image = "取决于image_type参数，传入BASE64字符串或URL字符串或FACE_TOKEN字符串";
+        String imageType = "BASE64";
+
+        // 人脸检测
+        JSONObject res = client.detect(image, imageType, options);
+        System.out.println(res.toString(2));
+
+    }*/
+}
+
+

shiwan/admin/src/main/java/com/huimv/admin/analyse/Comparison.java

@@ -0,0 +1,36 @@
+package com.huimv.admin.analyse;
+
+import com.alibaba.fastjson.JSON;
+import com.baidu.aip.face.AipFace;
+import com.baidu.aip.face.MatchRequest;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.analyse
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/27 0027 14:11
+ **/
+public class Comparison {
+
+
+   public void Comparison(AipFace client){
+       String image1 = "C:/Users/Administrator/Desktop/1609048902097.jpg";
+       String image2 = "C:/Users/Administrator/Desktop/1609048912029.jpg";
+
+       // image1/image2也可以为url或facetoken, 相应的imageType参数需要与之对应。
+       MatchRequest req1 = new MatchRequest(image1, "BASE64");
+       MatchRequest req2 = new MatchRequest(image2, "BASE64");
+       ArrayList<MatchRequest> requests = new ArrayList<MatchRequest>();
+       requests.add(req1);
+       requests.add(req2);
+
+       JSONObject res = client.match(requests);
+       System.out.println(res.toString(2));
+
+   }
+}

shiwan/admin/src/main/java/com/huimv/admin/analyse/Sample.java

@@ -0,0 +1,70 @@
+package com.huimv.admin.analyse;
+
+import com.baidu.aip.face.AipFace;
+import com.baidu.aip.http.AipRequest;
+import com.baidu.aip.util.Base64Util;
+import com.baidu.aip.util.Util;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.analyse
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/27 0027 13:21
+ **/
+
+public class Sample {
+
+    public static final String APP_ID = "23396383";
+    public static final String API_KEY = "EiCulalmXcwLlxqicQrlYdxe";
+    public static final String SECRET_KEY = "YYWBzZqyx6CTtzA9ldmfMME85AXMNTlx";
+    public static void main(String[] args) throws IOException {
+        //初始化一个FaceClient
+        AipFace face = new AipFace(APP_ID,API_KEY ,SECRET_KEY);
+      /*  //可选：设置网络连接参数
+        face.setConnectionTimeoutInMillis(60000);
+        face.setSocketTimeoutInMillis(60000);
+        //调用API
+        HashMap map = new HashMap();
+        //
+        map.put("face_fields", "age,beauty,expression,gender,glasses,race,qualities");
+        String path = "G:/BaiduNetdiskDownload/pc/wallhaven-9mxjqk.png";
+        AipRequest aipRequest = new AipRequest();
+        aipRequest.setBody(map);
+        String image = Base64Util.encode(Util.readFileByBytes(path));
+
+        String groupId = "shiwan";
+        String userId = "yxx";
+
+
+        JSONObject result = face.addUser(image,"BASE64",groupId,userId,map);
+        System.out.println(result.toString(2));*/
+      sample(face);
+    }
+
+    public static void sample(AipFace client) throws IOException {
+        // 传入可选参数调用接口
+        HashMap<String, String> options = new HashMap<String, String>();
+        options.put("quality_control", "NORMAL");
+        options.put("liveness_control", "LOW");
+
+        //String path = "G:/BaiduNetdiskDownload/pc/wallhaven-39mdmy.jpg";
+       String path = "C:/Users/Administrator/Desktop/1.jpg";
+        String image = Base64Util.encode(Util.readFileByBytes(path));
+        String imageType = "BASE64";
+        String groupIdList = "shiwan";
+       /* String idCardNumber = "yxx";
+        String name = "shiwan";*/
+
+
+        // 身份验证
+        JSONObject res =  client.search(image, imageType, groupIdList , options);
+        System.out.println(res.toString(2));
+
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/analyse/Test.java

@@ -0,0 +1,29 @@
+package com.huimv.admin.analyse;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+
+import com.baidu.aip.util.Base64Util;
+import com.huimv.admin.utils.HttpUtils;
+import org.json.JSONObject;
+
+import com.baidu.aip.face.AipFace;
+
+
+public class  Test {
+    public static void main(String[] args) throws Exception {
+        /****************/
+        String Filepath = "G:/BaiduNetdiskDownload/pc/wallhaven-9mxjqk.png";
+        String image = Base64Util.encode(Filepath.getBytes());
+        String url = "https://aip.baidubce.com/rest/2.0/face/v1/detect";
+        String params = URLEncoder.encode("image", "UTF-8") + "=" + URLEncoder.encode(image, "UTF-8") + "&face_fields=age,beauty,expression,gender,glasses,race,qualities";
+        try {
+            HttpUtils httpUtil = new HttpUtils();
+            String result = HttpUtils.post(url, "24.2f135b4b7f7e21953a7cd9dacc14586b.2592000.1611635464.282335-23396383", params);
+            System.out.println(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/controller/AccountController.java

@@ -1,8 +1,7 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 ;
-import com.huimv.admin.domain.primary.SysAccountEntity;
-import com.huimv.admin.service.IAccountService;
+import com.huimv.admin.service.primary.IAccountService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -38,7 +37,7 @@ public class AccountController {
 
 
     @RequestMapping("/list")
-    public List<SysAccountEntity> listAccount(){
+    public Result listAccount(){
         return iAccountService.findAll();
     }
 

shiwan/admin/src/main/java/com/huimv/admin/controller/AuthorizeController.java

@@ -1,8 +1,8 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 import com.huimv.admin.domain.primary.SysMenuEntity;
-import com.huimv.admin.service.IAuthorizeService;
-import com.huimv.admin.service.IMenuService;
+import com.huimv.admin.service.primary.IAuthorizeService;
+import com.huimv.admin.service.primary.IMenuService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class AuthorizeController {
         /*
          * 获取用户的菜单数据
          */
-        List<SysMenuEntity> myMenu = iAuthorizeService.getMyMenu(accountName);
+        List<SysMenuEntity> myMenu = iAuthorizeService.getMyMenuAll(accountName);
         List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
 
         return new Result(ResultCode.SUCCESS,list);

shiwan/admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -1,7 +1,7 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 import com.huimv.admin.domain.primary.SysAccountEntity;
-import com.huimv.admin.service.ILoginService;
+import com.huimv.admin.service.primary.ILoginService;
 import com.huimv.admin.session.AccessToken;
 import com.huimv.admin.session.HmSession;
 import com.huimv.admin.utils.CheckNumber;

shiwan/admin/src/main/java/com/huimv/admin/controller/MenuController.java

@@ -1,14 +1,11 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 import com.huimv.admin.domain.primary.SysMenuEntity;
-import com.huimv.admin.service.IMenuService;
+import com.huimv.admin.service.primary.IMenuService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-
 @CrossOrigin
 @RestController
 @RequestMapping("/menu")
@@ -39,7 +36,7 @@ public class MenuController {
     }*/
 
     @PostMapping("/list")
-    public List<Map> optimizeList() {
+    public Result optimizeList() {
         return menuService.optimizeList();
     }
 }

shiwan/admin/src/main/java/com/huimv/admin/controller/primary/ProductionDataController.java

@@ -0,0 +1,78 @@
+package com.huimv.admin.controller.primary;
+
+import com.huimv.admin.domain.primary.ProductionData;
+import com.huimv.admin.service.primary.IProductionDataService;
+import com.huimv.admin.utils.Result;
+import com.huimv.admin.utils.ResultCode;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/4 0004 15:01
+ **/
+@CrossOrigin
+@RestController
+@RequestMapping("/productionData")
+public class ProductionDataController {
+
+    @Autowired
+    private IProductionDataService productionDataService;
+
+
+    @RequestMapping("/add")
+    public Result addProductionData (ProductionData productionData){
+        try {
+            productionDataService.save(productionData);
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+
+    @RequestMapping("/update")
+    public Result updateProductionData (ProductionData productionData){
+        try {
+            if (productionData.getId() == null){
+                return new Result(10001,"请选择要修改的数据",false);
+            }
+            productionDataService.update(productionData);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+    }
+
+
+    @RequestMapping("/delete")
+    public Result deleteProductionData (@RequestParam(required = false) List<Integer> ids){
+        try {
+            if (ids == null || ids.size() <= 0){
+                return new Result(10001,"请选择要删除的数据",false);
+            }
+            productionDataService.delete(ids);
+            return new Result(10000,"删除成功",true);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+    }
+
+    @RequestMapping("/list")
+    public Result findProductionData (){
+        try {
+            List<ProductionData> productionDataList = productionDataService.findAll();
+           return new Result(ResultCode.SUCCESS,productionDataList);
+        }catch (Exception e){
+            return new Result(ResultCode.FAIL,null);
+        }
+    }
+
+}

shiwan/admin/src/main/java/com/huimv/admin/controller/SysGroupController.java

@@ -1,8 +1,8 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 
 import com.huimv.admin.domain.primary.SysGroupEntity;
-import com.huimv.admin.service.IGroupService;
+import com.huimv.admin.service.primary.IGroupService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

shiwan/admin/src/main/java/com/huimv/admin/controller/SysUserController.java

@@ -1,12 +1,10 @@
-package com.huimv.admin.controller;
+package com.huimv.admin.controller.primary;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.admin.domain.primary.SysUserEntity;
-import com.huimv.admin.domain.secondary.Users;
 import com.huimv.admin.group.UserAndAccountGroup;
-import com.huimv.admin.repo.secondary.UsersRepository;
-import com.huimv.admin.service.IUserService;
+import com.huimv.admin.service.primary.IUserService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -54,12 +52,4 @@ public class SysUserController {
         return iUserService.findUserAccount(searchStr,pageNum,pageSize);
     }
 
-    @Autowired
-    private UsersRepository usersRepository;
-    @RequestMapping("/list1")
-    public void listUser1(){
-
-      usersRepository.save(new Users());
-    }
-
 }

shiwan/admin/src/main/java/com/huimv/admin/controller/secondary/DpSjlrSyController.java

@@ -0,0 +1,40 @@
+package com.huimv.admin.controller.secondary;
+
+import com.huimv.admin.service.secondary.IDpSjlrSyService;
+import com.huimv.admin.utils.Result;
+import com.huimv.admin.utils.ResultCode;
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.controller.secondary
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/12 0012 11:19
+ **/
+@CrossOrigin
+@RestController
+@RequestMapping("/dpSjlrSyS")
+public class DpSjlrSyController {
+
+    @Autowired
+    private IDpSjlrSyService dpSjlrSyService;
+
+    @RequestMapping("/find")
+    public Result find(){
+        try {
+            Map map = dpSjlrSyService.find();
+            return new Result(ResultCode.SUCCESS,map);
+        }catch (Exception e){
+            return new Result(ResultCode.FAIL,null);
+        }
+
+    }
+
+}

shiwan/admin/src/main/java/com/huimv/admin/domain/primary/ProductionData.java

@@ -0,0 +1,30 @@
+package com.huimv.admin.domain.primary;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.domain.primary
+ * @Description : 首页生产数据
+ * @Author : yuxuexuan
+ * @Create : 2021/1/4 0004 14:44
+ **/
+
+@Entity
+@Table(name = "production_data")
+@Data
+public class ProductionData {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "pig_num")
+    private String pigNum;
+}

shiwan/admin/src/main/java/com/huimv/admin/domain/secondary/DpSjlrSy.java

@@ -0,0 +1,39 @@
+package com.huimv.admin.domain.secondary;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.domain.secondary
+ * @Description : 大屏信息
+ * @Author : yuxuexuan
+ * @Create : 2021/1/12 0012 11:02
+ **/
+@Entity
+@Data
+@Table(name = "dp_sjlr_sy")
+public class DpSjlrSy {
+
+    @Id
+    @Column(name = "ID", nullable = false)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer ID;
+
+    @Column(name = "MCID")
+    private Integer MCID;
+
+    //存栏种猪
+    @Column(name = "CLSJZZ")
+    private String CLSJZZ;
+
+    //保育存栏
+    @Column(name = "CLSJBYZ")
+    private String CLSJBYZ;
+
+    //育肥存栏
+    @Column(name = "CLSJYFZ")
+    private String CLSJYFZ;
+
+}

shiwan/admin/src/main/java/com/huimv/admin/domain/secondary/Users.java

@@ -1,38 +0,0 @@
-package com.huimv.admin.domain.secondary;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.admin.domain.secondary
- * @Description : TODO
- * @Author : yuxuexuan
- * @Create : 2020/12/25 0025 17:07
- **/
-@Entity
-@Data
-@Table(name = "users")
-public class Users {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "name")
-    private String name;
-
-    @Column(name = "gender")
-    private Integer gender;
-
-    @Column(name = "age")
-    private Integer age;
-
-    @Column(name = "created")
-    @Temporal(TemporalType.TIME)
-    private Date created;
-
-}

shiwan/admin/src/main/java/com/huimv/admin/repo/primary/MemberAccountRepository.java

@@ -4,7 +4,5 @@ import com.huimv.admin.domain.primary.MemberAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MemberAccountRepository extends JpaRepository<MemberAccount, Integer> {
-	
-	MemberAccount findByLoginName(String loginName);
-	
+
 }

shiwan/admin/src/main/java/com/huimv/admin/repo/primary/ProductionDataEntityRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.admin.repo.primary;
+
+import com.huimv.admin.domain.primary.ProductionData;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProductionDataEntityRepository extends JpaRepository<ProductionData, Integer> {
+}

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/DpSjlrSyRepo.java

@@ -0,0 +1,18 @@
+package com.huimv.admin.repo.secondary;
+
+import com.huimv.admin.domain.secondary.DpSjlrSy;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.repo.secondary
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/12 0012 11:27
+ **/
+public interface DpSjlrSyRepo extends JpaRepository<DpSjlrSy,InternalError>, JpaSpecificationExecutor<DpSjlrSy> {
+    List<DpSjlrSy> findAllByMCID(int i);
+}

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/UsersRepository.java

@@ -1,15 +0,0 @@
-package com.huimv.admin.repo.secondary;
-
-import com.huimv.admin.domain.primary.MemberAccount;
-import com.huimv.admin.domain.secondary.Users;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.admin.repo.secondary
- * @Description : TODO
- * @Author : yuxuexuan
- * @Create : 2020/12/25 0025 17:13
- **/
-public interface UsersRepository extends JpaRepository<Users, Integer> {
-}

shiwan/admin/src/main/java/com/huimv/admin/service/IAccountService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.utils.Result;
@@ -15,5 +15,5 @@ public interface IAccountService {
 
     Result removeAccount(List<Integer> ids);
 
-    List<SysAccountEntity> findAll();
+    Result findAll();
 }

shiwan/admin/src/main/java/com/huimv/admin/service/IAuthorizeService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.huimv.admin.utils.Result;
 
@@ -18,4 +18,16 @@ public interface IAuthorizeService {
     Result getGroupByAccount(String accountId);
 
     Result getAccountByGroup(String groupId);
+
+    /*
+    * @Method      : getMyMenuAll
+    * @Description :
+    * @Params      : [accountName]
+    * @Return      : java.util.List
+    *
+    * @Author      : yuxuexuan
+    * @Date        : 2021/1/6 0006
+    * @Time        : 10:37
+    */
+    List getMyMenuAll(String accountName);
 }

shiwan/admin/src/main/java/com/huimv/admin/service/IGroupService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.huimv.admin.domain.primary.SysGroupEntity;
 import com.huimv.admin.utils.Result;

shiwan/admin/src/main/java/com/huimv/admin/service/ILoginService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.huimv.admin.utils.Result;
 

shiwan/admin/src/main/java/com/huimv/admin/service/IMenuService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.utils.Result;
@@ -19,7 +19,7 @@ public interface IMenuService {
     List listMenuUtil(List<SysMenuEntity> list);*/
 
     //优化查询所有
-    List<Map> optimizeList();
+    Result optimizeList();
     //优化菜单递归
     List<Map> optimizeListUtil(int parentId, List<SysMenuEntity> menuEntityList);
 }

shiwan/admin/src/main/java/com/huimv/admin/service/primary/IProductionDataService.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.service.primary;
+
+import com.huimv.admin.domain.primary.ProductionData;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/4 0004 14:54
+ **/
+public interface IProductionDataService {
+
+    void save(ProductionData productionData);
+
+    void update(ProductionData productionData);
+
+    void delete(List<Integer> ids);
+
+    List<ProductionData> findAll();
+}

shiwan/admin/src/main/java/com/huimv/admin/service/IUserService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service;
+package com.huimv.admin.service.primary;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.admin.domain.primary.SysUserEntity;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/AccountServiceImpl.java

@@ -1,10 +1,10 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.domain.primary.SysUserEntity;
 import com.huimv.admin.repo.primary.SysAccountEntityRepository;
 import com.huimv.admin.repo.primary.SysUserEntityRepository;
-import com.huimv.admin.service.IAccountService;
+import com.huimv.admin.service.primary.IAccountService;
 import com.huimv.admin.utils.GetMD5Str;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
@@ -31,7 +31,7 @@ public class AccountServiceImpl implements IAccountService {
                 sysAccountEntityRepository.updateAccountStatus(id,status);
             }
         }catch (Exception e){
-            return new Result(ResultCode.FAIL);
+            return new Result(10001,"插入失败",false);
         }
         String message = "";
         if(status == 1){
@@ -39,7 +39,7 @@ public class AccountServiceImpl implements IAccountService {
         }else{
             message = "你选择的账号已经暂停启用。";
         }
-        return new Result(10001,message,true);
+        return new Result(10000,message,true);
     }
 
     @Override
@@ -54,15 +54,15 @@ public class AccountServiceImpl implements IAccountService {
             }else if (userName != null && !"".equals(userName)){
                 sysAccountEntity.setAccountName(userName);
             }else {
-                return new Result(ResultCode.FAIL);
+                return new Result(10000,"新增失败",false);
             }
             sysAccountEntity.setAccountStatus(1);
             sysAccountEntity.setRemark("无");
             sysAccountEntity.setPassword(GetMD5Str.getMD5Str("123456"));
             sysAccountEntityRepository.save(sysAccountEntity);
-            return new Result(ResultCode.SUCCESS);
+            return new Result(10000,"插入成功",true);
         }catch (Exception e){
-            return new Result(ResultCode.FAIL);
+            return new Result(10001,"插入失败",false);
         }
     }
 
@@ -72,9 +72,9 @@ public class AccountServiceImpl implements IAccountService {
             SysAccountEntity sysAccountEntity = sysAccountEntityRepository.findById(id).get();
             sysAccountEntity.setAccountStatus(accountStatus);
             sysAccountEntityRepository.save(sysAccountEntity);
-            return new Result(ResultCode.SUCCESS);
+            return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            return new Result(ResultCode.FAIL);
+            return new Result(10001,"修改失败",false);
         }
     }
 
@@ -85,13 +85,14 @@ public class AccountServiceImpl implements IAccountService {
                 sysAccountEntityRepository.deleteById(id);
             }
         }catch (Exception e){
-            return new Result(ResultCode.FAIL);
+            return new Result(10001,"删除失败",false);
         }
-        return new Result(ResultCode.SUCCESS);
+        return new Result(10000,"删除成功",true);
     }
 
     @Override
-    public List<SysAccountEntity> findAll() {
-        return sysAccountEntityRepository.findAll();
+    public Result findAll() {
+        List<SysAccountEntity> all = sysAccountEntityRepository.findAll();
+        return new Result(ResultCode.SUCCESS,all);
     }
 }

shiwan/admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.huimv.admin.domain.primary.SysAccountGroupEntity;
 import com.huimv.admin.domain.primary.SysGroupMenuEntity;
@@ -6,7 +6,7 @@ import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.repo.primary.SysAccountGroupEntityRepository;
 import com.huimv.admin.repo.primary.SysGroupMenuEntityRepository;
 import com.huimv.admin.repo.primary.SysMenuEntityRepository;
-import com.huimv.admin.service.IAuthorizeService;
+import com.huimv.admin.service.primary.IAuthorizeService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -222,4 +222,9 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         }
         return new Result(ResultCode.SUCCESS, idSb.toString());
     }
+
+    @Override
+    public List getMyMenuAll(String accountName) {
+        return sysMenuEntityRepo.getMyMenu(accountName);
+    }
 }

shiwan/admin/src/main/java/com/huimv/admin/service/impl/GroupServiceImpl.java

@@ -1,11 +1,10 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.huimv.admin.domain.primary.SysGroupEntity;
 import com.huimv.admin.repo.primary.SysGroupEntityRepository;
 import com.huimv.admin.repo.primary.SysGroupMenuEntityRepository;
-import com.huimv.admin.service.IGroupService;
+import com.huimv.admin.service.primary.IGroupService;
 import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -28,14 +27,14 @@ public class GroupServiceImpl implements IGroupService {
         try {
             SysGroupEntity group = this.sysGroupEntityRepository.findById(groupId).orElse(null);
             if (group == null) {
-                return  new Result(ResultCode.FAIL);
+                return new Result(10002,"请选择数据",false);
             }
             group.setGroupName(groupName);
             group.setRemark(remark);
             sysGroupEntityRepository.save(group);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"修改失败",false);
         }
     }
 
@@ -45,15 +44,15 @@ public class GroupServiceImpl implements IGroupService {
         try {
             SysGroupEntity group = this.sysGroupEntityRepository.findById(groupId).orElse(null);
             if (group == null) {
-                return  new Result(ResultCode.FAIL);
+                return new Result(10002,"请选择数据",false);
             }
             // 删除权限组
             this.sysGroupEntityRepository.deleteById(groupId);
             // 删除权限组关联菜单
             sysGroupMenuEntityRepository.deleteByGroupId(groupId);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10001,"删除成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"删除失败",false);
         }
     }
 
@@ -73,9 +72,9 @@ public class GroupServiceImpl implements IGroupService {
             group.setGroupName(groupName);
             group.setRemark(remark);
             sysGroupEntityRepository.save(group);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"添加成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"添加失败",false);
         }
     }
 }

shiwan/admin/src/main/java/com/huimv/admin/service/impl/LoginServiceImpl.java

@@ -1,9 +1,8 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.repo.primary.SysAccountEntityRepository;
-import com.huimv.admin.repo.primary.SysMenuEntityRepository;
-import com.huimv.admin.service.ILoginService;
+import com.huimv.admin.service.primary.ILoginService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +13,6 @@ public class LoginServiceImpl implements ILoginService {
 
     @Autowired
     private SysAccountEntityRepository sysAccountEntityRepo;
-    @Autowired
-    private SysMenuEntityRepository sysMenuEntityRepo;
 
     @Override
     public Result login(String accountName, String password) {
@@ -44,8 +41,6 @@ public class LoginServiceImpl implements ILoginService {
 
     @Override
     public Result logout() {
-
-
         return null;
     }
 }

shiwan/admin/src/main/java/com/huimv/admin/service/impl/MenuServiceImpl.java

@@ -1,11 +1,12 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.repo.primary.SysMenuEntityRepository;
-import com.huimv.admin.service.IMenuService;
+import com.huimv.admin.service.primary.IMenuService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -27,9 +28,9 @@ public class MenuServiceImpl implements IMenuService {
                 return  new Result(10002,"参数错误",false);
             }
             sysMenuEntityRepository.save(menu);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"添加成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"添加失败",false);
         }
     }
 
@@ -40,9 +41,9 @@ public class MenuServiceImpl implements IMenuService {
                 return new Result(10002,"请选择要修改的菜单",false);
             }
             sysMenuEntityRepository.save(menu);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"修改失败",false);
         }
 
     }
@@ -59,17 +60,18 @@ public class MenuServiceImpl implements IMenuService {
             }
             sysMenuEntityRepository.deleteById(menuId);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"删除失败",false);
         }
-        return  new Result(ResultCode.SUCCESS);
+        return new Result(10000,"删除成功",true);
     }
 
    //查询菜单，只查一次数据库
     @Override
-    public List<Map> optimizeList() {
-        List<SysMenuEntity> all = sysMenuEntityRepository.findAll();
+    public Result optimizeList() {
+        Sort sort = Sort.by(Sort.Direction.ASC, "sort");
+        List<SysMenuEntity> all = sysMenuEntityRepository.findAll(sort);
         List list = optimizeListUtil(0,all);
-        return list;
+        return new Result(ResultCode.SUCCESS,list);
     }
 
     @Override
@@ -106,4 +108,6 @@ public class MenuServiceImpl implements IMenuService {
     }
 
 
+
+
 }

shiwan/admin/src/main/java/com/huimv/admin/service/primary/impl/ProductionDataServiceImpl.java

@@ -0,0 +1,45 @@
+package com.huimv.admin.service.primary.impl;
+
+import com.huimv.admin.domain.primary.ProductionData;
+import com.huimv.admin.repo.primary.ProductionDataEntityRepository;
+import com.huimv.admin.service.primary.IProductionDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/4 0004 14:54
+ **/
+@Service
+public class ProductionDataServiceImpl implements IProductionDataService {
+
+    @Autowired
+    private ProductionDataEntityRepository productionDataEntityRepository;
+
+    @Override
+    public void save(ProductionData productionData) {
+        productionDataEntityRepository.save(productionData);
+    }
+
+    @Override
+    public void update(ProductionData productionData) {
+        productionDataEntityRepository.save(productionData);
+    }
+
+    @Override
+    public void delete(List<Integer> ids) {
+        for (Integer id : ids) {
+            productionDataEntityRepository.deleteById(id);
+        }
+    }
+
+    @Override
+    public List<ProductionData> findAll() {
+        return productionDataEntityRepository.findAll();
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/service/impl/UserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service.impl;
+package com.huimv.admin.service.primary.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -7,7 +7,7 @@ import com.huimv.admin.domain.primary.SysUserEntity;
 import com.huimv.admin.group.UserAndAccountGroup;
 import com.huimv.admin.repo.primary.SysAccountEntityRepository;
 import com.huimv.admin.repo.primary.SysUserEntityRepository;
-import com.huimv.admin.service.IUserService;
+import com.huimv.admin.service.primary.IUserService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import com.huimv.admin.utils.id.SnowflakeSequence;
@@ -234,9 +234,9 @@ public class UserServiceImpl implements IUserService {
             sysAccountEntity.setPassword("123456");
             sysAccountEntity.setUserId(userId);
             sysAccountEntityRepository.save(sysAccountEntity);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+             return new Result(10001,"添加失败",false);
         }
     }
 
@@ -247,9 +247,9 @@ public class UserServiceImpl implements IUserService {
                 return  new Result(ResultCode.FAIL);
             }
             sysUserEntityRepository.save(user);
-            return  new Result(ResultCode.SUCCESS);
+            return new Result(10000,"修改成功",true);
         }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
+            return new Result(10001,"修改失败",false);
         }
     }
 
@@ -259,16 +259,16 @@ public class UserServiceImpl implements IUserService {
             try {
                 SysUserEntity user = this.sysUserEntityRepository.findById(userId).orElse(null);
                 if (user == null) {
-                    return  new Result(ResultCode.FAIL);
+                    return new Result(10002,"请选择数据",false);
                 }
                 this.sysUserEntityRepository.deleteById(userId);
                 // 删除账号
                 this.sysAccountEntityRepository.deleteByUserId(user.getUserId());
             }catch (Exception e){
-                return  new Result(ResultCode.FAIL);
+                return new Result(10001,"删除失败",false);
             }
         }
-        return  new Result(ResultCode.SUCCESS);
+        return new Result(10000,"删除成功",false);
     }
 
     private UserAndAccountGroup saveUser(SysUserEntity user) {

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/IDpSjlrSyService.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.service.secondary;
+
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.service.secondary
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/12 0012 11:18
+ **/
+public interface IDpSjlrSyService {
+    Map find();
+}

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/IDpSjlrSyServiceImpl.java

@@ -0,0 +1,37 @@
+package com.huimv.admin.service.secondary.impl;
+
+import com.huimv.admin.domain.secondary.DpSjlrSy;
+import com.huimv.admin.repo.secondary.DpSjlrSyRepo;
+import com.huimv.admin.service.secondary.IDpSjlrSyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.service.secondary.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/1/12 0012 11:18
+ **/
+@Service
+public class IDpSjlrSyServiceImpl implements IDpSjlrSyService {
+
+    @Autowired
+    private DpSjlrSyRepo dpSjlrSyRepo;
+
+    @Override
+    public Map find() {
+        List<DpSjlrSy> allByMCID = dpSjlrSyRepo.findAllByMCID(39);
+        Map map = new HashMap();
+        map.put("存栏种猪",allByMCID.get(0).getCLSJZZ());
+        map.put("保育存栏",allByMCID.get(0).getCLSJBYZ());
+        map.put("育肥存栏",allByMCID.get(0).getCLSJYFZ());
+
+        return map;
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/utils/HttpClient.java

@@ -0,0 +1,167 @@
+package com.huimv.admin.utils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/*****
+ * @Author:  yangdi  hm
+ * @Description: entity
+ ****/
+public   class HttpClient {
+    private String url;
+    private Map<String, String> param;
+    private int statusCode;
+    private String content;
+    private String xmlParam;
+    private boolean isHttps;
+
+    public boolean isHttps() {
+        return isHttps;
+    }
+
+    public  void   setHttps(boolean isHttps) {
+        this.isHttps = isHttps;
+    }
+
+    public String getXmlParam() {
+        return xmlParam;
+    }
+
+    public void setXmlParam(String xmlParam) {
+        this.xmlParam = xmlParam;
+    }
+
+    public HttpClient(String url, Map<String, String> param) {
+        this.url = url;
+        this.param = param;
+    }
+
+    public HttpClient(String url) {
+        this.url = url;
+    }
+
+    public void setParameter(Map<String, String> map) {
+        param = map;
+    }
+
+    public void addParameter(String key, String value) {
+        if (param == null)
+            param = new HashMap<String, String>();
+        param.put(key, value);
+    }
+
+    public void post() throws ClientProtocolException, IOException {
+        HttpPost http = new HttpPost(url);
+        setEntity(http);
+        execute(http);
+    }
+
+    public void put() throws ClientProtocolException, IOException {
+        HttpPut http = new HttpPut(url);
+        setEntity(http);
+        execute(http);
+    }
+
+    public void get() throws ClientProtocolException, IOException {
+        if (param != null) {
+            StringBuilder url = new StringBuilder(this.url);
+            boolean isFirst = true;
+            for (String key : param.keySet()) {
+                if (isFirst) {
+                    url.append("?");
+                }else {
+                    url.append("&");
+                }
+                url.append(key).append("=").append(param.get(key));
+            }
+            this.url = url.toString();
+        }
+        HttpGet http = new HttpGet(url);
+        execute(http);
+    }
+    /**
+     * set http post,put param
+     */
+    private void setEntity(HttpEntityEnclosingRequestBase http) {
+        if (param != null) {
+            List<NameValuePair> nvps = new LinkedList<NameValuePair>();
+            for (String key : param.keySet()) {
+                nvps.add(new BasicNameValuePair(key, param.get(key))); // 参数
+            }
+            http.setEntity(new UrlEncodedFormEntity(nvps, Consts.UTF_8)); // 设置参数
+        }
+        if (xmlParam != null) {
+            http.setEntity(new StringEntity(xmlParam, Consts.UTF_8));
+        }
+    }
+
+    private void execute(HttpUriRequest http) throws ClientProtocolException,
+            IOException {
+        CloseableHttpClient httpClient = null;
+        try {
+            if (isHttps) {
+                SSLContext sslContext = new SSLContextBuilder()
+                        .loadTrustMaterial(null, new TrustStrategy() {
+                            // 信任所有
+                            @Override
+                            public boolean isTrusted(X509Certificate[] chain,
+                                                     String authType)
+                                    throws CertificateException {
+                                return true;
+                            }
+                        }).build();
+                SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
+                        sslContext);
+                httpClient = HttpClients.custom().setSSLSocketFactory(sslsf)
+                        .build();
+            } else {
+                httpClient = HttpClients.createDefault();
+            }
+            CloseableHttpResponse response = httpClient.execute(http);
+            try {
+                if (response != null) {
+                    if (response.getStatusLine() != null) {
+                        statusCode = response.getStatusLine().getStatusCode();
+                    }
+                    HttpEntity entity = response.getEntity();
+                    // 响应内容
+                    content = EntityUtils.toString(entity, Consts.UTF_8);
+                }
+            } finally {
+                response.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            httpClient.close();
+        }
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+    public String getContent() throws ParseException, IOException {
+        return content;
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/utils/HttpUtils.java

@@ -0,0 +1,58 @@
+package com.huimv.admin.utils;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * http 工具类
+ */
+public class HttpUtils {
+
+    public static String post(String requestUrl, String accessToken, String params) throws Exception {
+        String generalUrl = requestUrl + "?access_token=" + accessToken;
+        URL url = new URL(generalUrl);
+        // 打开和URL之间的连接
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("POST");
+        // 设置通用的请求属性
+        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setRequestProperty("Connection", "Keep-Alive");
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setDoInput(true);
+
+        // 得到请求的输出流对象
+        DataOutputStream out = new DataOutputStream(connection.getOutputStream());
+        out.writeBytes(params);
+        out.flush();
+        out.close();
+
+        // 建立实际的连接
+        connection.connect();
+        // 获取所有响应头字段
+        Map<String, List<String>> headers = connection.getHeaderFields();
+        // 遍历所有的响应头字段
+        for (String key : headers.keySet()) {
+            System.out.println(key + "--->" + headers.get(key));
+        }
+        // 定义 BufferedReader输入流来读取URL的响应
+        BufferedReader in = null;
+        if (requestUrl.contains("nlp"))
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        else
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        String result = "";
+        String getLine;
+        while ((getLine = in.readLine()) != null) {
+            result += getLine;
+        }
+        in.close();
+        System.out.println("result:" + result);
+        return result;
+    }
+}

shiwan/admin/src/main/resources/application-test.yml

@@ -1,11 +1,11 @@
 server:
-  port: 8081
+  port: 8095
 spring:
   #------DataSource-----
   datasource:
     primary:
       #url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://192.168.1.7:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://122.112.250.26:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
       username: root
       password: hm123456
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -14,8 +14,8 @@ spring:
       min-idle: 8
       initial-size: 10
     secondary:
-      url: jdbc:mysql://192.168.1.7:3306/demo_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-      username: root
+      url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: huimv
       password: hm123456
       driver-class-name: com.mysql.cj.jdbc.Driver
       max-active: 20