手机端部署

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

@@ -25,7 +25,7 @@ public class AuthorizeController {
     IMenuService iMenuService;
 
     @RequestMapping("/saveAccountGroup")
-    public Result saveAccountGroup(@RequestParam(name = "accountId", required = true) String accountId, @RequestParam(name = "groupIds", required = true) String groupIds){
+    public Result saveAccountGroup(@RequestParam(name = "accountId") String accountId, @RequestParam(name = "groupIds") String groupIds){
         /*
          * 保存账号关联权限组数据
          */

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

@@ -66,6 +66,7 @@ public class LoginController {
         return iLoginService.logout();
     }
 
+    //获取验证码
     @RequestMapping(value = "getCheckNumber", produces = {"text/html;charset=UTF-8"})
     public void getCheckNumber(HttpServletResponse response) throws IOException {
         //创建对象

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

@@ -0,0 +1,38 @@
+package com.huimv.admin.controller.secondary;
+
+import com.huimv.admin.domain.secondary.DaZsda;
+import com.huimv.admin.service.secondary.DaZsdaService;
+import com.huimv.admin.utils.Result;
+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;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/DaZsda")
+public class DaZsdaController {
+
+	@Autowired
+	private DaZsdaService service;
+
+	@RequestMapping("/add")
+	public Result add(DaZsda childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result remove(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(DaZsda childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAllById")
+	public Result findAllById(Integer id){ return service.findAllById(id); }
+
+
+	@RequestMapping("/findAll")
+	public Result findAll(String name , @RequestParam(required = false) Integer pageNum ,  @RequestParam(required = false)Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
+
+}

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

@@ -0,0 +1,141 @@
+package com.huimv.admin.domain.secondary;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 档案_机器档案
+ */
+@Entity
+@Table(name = "da_jqda")
+@Data
+public class DaJqda implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+    /**
+     * 猪舍ID
+     */
+    @Column(name = "ZSID")
+    private Integer ZSID;
+
+    /**
+     * 区划编码
+     */
+    @Column(name = "QHBM")
+    private String QHBM;
+
+    /**
+     * 目标版本
+     */
+    @Column(name = "MBBB")
+    private String MBBB;
+
+    /**
+     * ftp命令
+     */
+    @Column(name = "FTPCMD")
+    private String FTPCMD;
+
+    /**
+     * 修改人
+     */
+    @Column(name = "XGR")
+    private String XGR;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "XGSJ", nullable = false)
+    private Date XGSJ;
+
+    /**
+     * 作废标志
+     */
+    @Column(name = "ZFBZ")
+    private Integer ZFBZ;
+
+    /**
+     * 当前版本
+     */
+    @Column(name = "DQBB")
+    private String DQBB;
+
+    /**
+     * 环控当前版本
+     */
+    @Column(name = "HKDQBB")
+    private String HKDQBB;
+
+    /**
+     * 环控目标版本
+     */
+    @Column(name = "HKMBBB")
+    private String HKMBBB;
+
+    /**
+     * 环控CMD命令
+     */
+    @Column(name = "HKFTPCMD")
+    private String HKFTPCMD;
+
+    /**
+     * 料槽当前版本
+     */
+    @Column(name = "LCDQBB")
+    private String LCDQBB;
+
+    /**
+     * 料槽目标版本
+     */
+    @Column(name = "LCMBBB")
+    private String LCMBBB;
+
+    /**
+     * 料槽CMD命令
+     */
+    @Column(name = "LCFTPCMD")
+    private String LCFTPCMD;
+
+    /**
+     * 序列号
+     */
+    @Column(name = "XLH")
+    private String XLH;
+
+    /**
+     * 站点号
+     */
+    @Column(name = "ZDH")
+    private String ZDH;
+
+    @Column(name = "IMEI")
+    private String IMEI;
+
+    @Column(name = "IMSI")
+    private String IMSI;
+
+    @Column(name = "CCID")
+    private String CCID;
+
+    @Column(name = "ESIMNAME")
+    private String ESIMNAME;
+
+}

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

@@ -0,0 +1,76 @@
+package com.huimv.admin.domain.secondary;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Entity
+@Table(name = "da_zsda")
+public class DaZsda implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "ID")
+	private Integer id;
+
+	@Column(name = "MCID")
+	private Integer mcid;
+
+	@Column(name = "ZSMC")
+	private String zsmc;
+
+	@Column(name = "CSQ1")
+	private String csq1;
+
+	@Column(name = "CSQ2")
+	private String csq2;
+
+	@Column(name = "FLQ")
+	private String flq;
+
+	@Column(name = "DQLQ")
+	private String dqlq;
+
+	@Column(name = "YZJD")
+	private String yzjd;
+
+	@Column(name = "GLY")
+	private Integer gly;
+
+	@Column(name = "GLYXM")
+	private String glyxm;
+
+	@Column(name = "XGR")
+	private String xgr;
+
+	@Column(name = "XGSJ")
+	private Date xgsj;
+
+	@Column(name = "ZFBZ")
+	private Integer zfbz;
+
+	@Column(name = "ZSBZ")
+	private Integer zsbz;
+
+	@Column(name = "SSQY")
+	private Integer ssqy;
+
+	@Column(name = "LCBZ")
+	private Integer lcbz;
+
+	@Column(name = "HKBZ")
+	private Integer hkbz;
+
+	@Column(name = "ZDBZ")
+	private Integer zdbz;
+
+	@Column(name = "ZSQY")
+	private Integer zsqy;
+
+	@Column(name = "SPJK")
+	private String spjk;
+
+}

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

@@ -14,8 +14,8 @@ public interface SysAccountGroupEntityRepository extends JpaRepository<SysAccoun
 
     @Modifying
     @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_account_group WHERE account_id=?1")
-    void removeAccountGroup(String accountId);
+    @Query(nativeQuery = true,value = "DELETE FROM sys_account_group WHERE group_id=?1")
+    void removeAccountGroup(String groupIds);
 
     @Query(nativeQuery = true,value = "SELECT * FROM sys_account_group WHERE account_id=?1")
     List<SysAccountGroupEntity> getGroupByAccount(String accountId);

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

@@ -0,0 +1,9 @@
+package com.huimv.admin.repo.secondary;
+
+import com.huimv.admin.domain.secondary.DaJqda;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DaJqdaRepo extends JpaRepository<DaJqda, Integer>, JpaSpecificationExecutor<DaJqda> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.admin.repo.secondary;
+
+import com.huimv.admin.domain.secondary.DaZsda;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface DaZsdaRepository extends JpaRepository<DaZsda, Integer>, JpaSpecificationExecutor<DaZsda> {
+	
+	@Query(nativeQuery = true ,value = "select * from da_zsda where mcid like %?1% and MCID = 11 and ZFBZ = 0 limit ?2 , ?3")
+    List<DaZsda> findAll(String name, Integer startPage, Integer pageSize);
+
+    @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_zsda ")
+    List<Integer> findMax();
+}

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

@@ -28,13 +28,17 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     @Autowired
     private SysMenuEntityRepository sysMenuEntityRepository;
 
-    @Override
+ /*   @Override
     @Transactional
     public Result saveAccountGroup(String accountId, String groupIds) {
-        /**
+        *//**
          * Step1:先删除原先的账号关联权限组数据；
          * Step2:再添加新的账号关联权限组数据；
-         */
+         *//*
+        if (groupIds == null||"".equals(groupIds)){
+            SysAccountGroupRepo.removeAccountGroup(accountId);
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }
         String[] groupIdArray = groupIds.split(",");
         SysAccountGroupRepo.removeAccountGroup(accountId);
 //        for (int a = 0; a < groupIdArray.length; a++) {
@@ -48,6 +52,34 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
 //            SysAccountGroupRepo.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
         }
         return new Result(10001, "保存账号关联权限组成功", true);
+    } */
+    @Override
+    @Transactional
+    public Result saveAccountGroup(String accountId, String groupIds) {
+        /**
+         * Step1:先删除原先的账号关联权限组数据；
+         * Step2:再添加新的账号关联权限组数据；
+         */
+        if (accountId == null||"".equals(accountId)){
+            SysAccountGroupRepo.removeAccountGroup(groupIds);
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }else {
+            String[] groupIdArray = accountId.split(",");
+            SysAccountGroupRepo.removeAccountGroup(groupIds);
+//        for (int a = 0; a < groupIdArray.length; a++) {
+//            SysAccountGroupRepo.removeAccountGroup(accountId,groupIdArray[a]);
+//        }
+            for (int a = 0; a < groupIdArray.length; a++) {
+                SysAccountGroupEntity accountGroupEntity = new SysAccountGroupEntity();
+                accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
+                accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
+                SysAccountGroupRepo.saveAndFlush(accountGroupEntity);
+//            SysAccountGroupRepo.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
+            }
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }
+
+
     }
 
     @Override

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

@@ -50,7 +50,7 @@ public class GroupServiceImpl implements IGroupService {
             this.sysGroupEntityRepository.deleteById(groupId);
             // 删除权限组关联菜单
             sysGroupMenuEntityRepository.deleteByGroupId(groupId);
-            return new Result(10001,"删除成功",true);
+            return new Result(10000,"删除成功",true);
         }catch (Exception e){
             return new Result(10001,"删除失败",false);
         }

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

@@ -0,0 +1,23 @@
+package com.huimv.admin.service.secondary;
+
+
+import com.huimv.admin.domain.secondary.DaZsda;
+import com.huimv.admin.utils.Result;
+
+public interface DaZsdaService {
+
+   //添加
+   Result add(DaZsda entity);
+
+   //添加
+   Result remove(Integer[] ids);
+
+   //添加
+   Result update(DaZsda entity);
+
+   //查询
+  Result findAll(String name, Integer pageNum, Integer pageSize);
+
+   //根据id查找
+   Result findAllById(Integer id);
+}

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

@@ -0,0 +1,109 @@
+package com.huimv.admin.service.secondary.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.admin.domain.secondary.DaJqda;
+import com.huimv.admin.domain.secondary.DaZsda;
+import com.huimv.admin.repo.secondary.DaJqdaRepo;
+import com.huimv.admin.repo.secondary.DaZsdaRepository;
+import com.huimv.admin.service.secondary.DaZsdaService;
+import com.huimv.admin.utils.Result;
+import com.huimv.admin.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("thired")
+public class DaZsdaServiceImpl implements DaZsdaService {
+
+	@Autowired
+	private DaZsdaRepository rep;
+
+	@Autowired
+	private DaJqdaRepo jqdaRepo;
+
+	@Override
+	public Result add(DaZsda entity){
+		if (entity == null){
+
+			return new Result(ResultCode.FAIL);
+		}
+		try {
+
+			entity.setMcid(11);
+			Integer  id = rep.findMax().get(0);
+			entity.setXgsj(new Date());
+			DaJqda daJqda =new DaJqda() ;
+			daJqda.setZSID(id);
+			jqdaRepo.save(daJqda);
+			rep.save(entity);
+
+			return new Result(ResultCode.SUCCESS);
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
+	}
+
+
+
+	@Override
+	public Result remove(Integer[] ids) {
+		if (ids == null || ids.length==0){
+			return new Result(ResultCode.FAIL);
+		}
+		try {
+			for (Integer id : ids) {
+				rep.deleteById(id);
+			}
+			return new Result(ResultCode.SUCCESS);
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
+	}
+
+	@Override
+	public Result update(DaZsda entity) {
+		if (entity == null){
+			return new Result(ResultCode.FAIL);
+		}
+		try {
+			entity.setMcid(11);
+			entity.setXgsj(new Date());
+			rep.save(entity);
+			return new Result(ResultCode.SUCCESS);
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
+	}
+
+	@Override
+	public Result findAll(String name , Integer pageNum , Integer pageSize) {
+		try {
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<DaZsda> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+			
+			return new Result(ResultCode.SUCCESS,map);
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
+	}
+
+	@Override
+	public Result findAllById(Integer id) {
+		try {
+			DaZsda entity = rep.findById(id).get();
+			return new Result(ResultCode.SUCCESS);
+		}catch (Exception e){
+			return new Result(ResultCode.FAIL);
+		}
+	}
+}

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

@@ -33,7 +33,7 @@ spring:
 
   redis:
     database: 0
-    host: 124.71.192.190
+    host: 122.112.224.199
     port: 6379
     password: hm123456
     jedis:

shiwan/admin/src/main/resources/beans.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+</beans>

shiwan/admin/src/test/java/com/huimv/admin/AdminApplicationTests.java

@@ -3,11 +3,24 @@ package com.huimv.admin;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+import java.io.Console;
+import java.io.IOException;
+import java.nio.channels.Channel;
+import java.util.Map;
+import java.util.Properties;
+
 class AdminApplicationTests {
 
     @Test
-    void contextLoads() {
+    void contextLoads() throws IOException {
+
+        Properties properties = System.getProperties();
+        Object o1 = System.getProperties().get("sun.desktop");
+        System.out.println(o1);
+        for (Object o : properties.keySet()) {
+            System.out.println(""+o+"-->"+properties.get(o));
+        }
+
     }
 
 }