添加大屏修改

crontab_startall.sh

@@ -0,0 +1,102 @@
+
+adminName=huimv-farm-admin-0.0.1-SNAPSHOT-execute.jar
+adminLogName=admin_log.log
+current_time=$(date  +'%Y-%m-%d-%H:%M:%S')
+
+adminNumber=`ps -ef |grep -w $adminName |grep -v grep|wc -l`
+if [ $adminNumber -le 0 ];then
+   echo "The "$adminName" is not run":
+   curPath=$(readlink -f "$(dirname "$0")")
+   cd $curPath
+
+   nohup java -jar $adminName   -Xms256m -Xmx256m -Xmn96m > $curPath/$adminLogName  2>&1 &
+   echo $current_time" The "$adminName" is starting..."
+else
+   echo $current_time" The "$adminName" is running..."
+fi
+
+
+
+envName=huimv-farm-environ-0.0.1-SNAPSHOT-execute.jar
+envLogName=env_log.log
+current_time=$(date  +'%Y-%m-%d-%H:%M:%S')
+
+envNumber=`ps -ef |grep -w $envName |grep -v grep|wc -l`
+if [ $envNumber -le 0 ];then
+   echo "The "$envName" is not run":
+   curPath=$(readlink -f "$(dirname "$0")")
+   cd $curPath
+
+   nohup java -jar $envName  -Xms256m -Xmx256m -Xmn96m   > $curPath/$envLogName  2>&1 &
+   echo $current_time" The "$envName" is starting..."
+else
+   echo $current_time" The "$envName" is running..."
+fi
+
+
+
+gatewayName=huimv-farm-gateway-2.4.1.jar
+gatewayLogName=gateway_log.log
+current_time=$(date  +'%Y-%m-%d-%H:%M:%S')
+
+gatewayNumber=`ps -ef |grep -w $gatewayName |grep -v grep|wc -l`
+if [ $gatewayNumber -le 0 ];then
+   echo "The "$gatewayName" is not run"
+   curPath=$(readlink -f "$(dirname "$0")")
+   cd $curPath
+
+   nohup java -jar  $gatewayName  -Xms256m -Xmx256m -Xmn96m > $curPath/$gatewayLogName  2>&1 &
+   echo $current_time" The "$gatewayName" is starting..."
+   
+else
+   echo $current_time" The "$gatewayName" is running..."
+fi
+
+
+
+
+produceName=huimv-farm-produce-0.0.1-SNAPSHOT-execute.jar
+produceLogName=produce_log.log
+current_time=$(date  +'%Y-%m-%d-%H:%M:%S')
+
+produceNumber=`ps -ef |grep -w $produceName |grep -v grep|wc -l`
+if [ $produceNumber -le 0 ];then
+   echo "The "$produceName" is not run"
+   curPath=$(readlink -f "$(dirname "$0")")
+   cd $curPath
+
+   nohup java  -jar $produceName -Xms256m -Xmx256m -Xmn96m  > $curPath/$produceLogName  2>&1 &
+   echo $current_time" The "$produceName" is starting..."
+else
+   echo $current_time" The "$produceName" is running..."
+fi
+
+
+
+
+videoName=huimv-farm-video-0.0.1-SNAPSHOT-execute.jar
+videoLogName=video_log.log
+current_time=$(date  +'%Y-%m-%d-%H:%M:%S')
+
+videoNumber=`ps -ef |grep -w $videoName |grep -v grep|wc -l`
+if [ $videoNumber -le 0 ];then
+   echo "The "$videoName" is not run"
+   curPath=$(readlink -f "$(dirname "$0")")
+   cd $curPath
+
+   nohup java  -jar $videoName -Xms256m -Xmx256m -Xmn96m  > $curPath/$videoLogName  2>&1 &
+   echo $current_time" The "$videoName" is starting..."
+else
+   echo $current_time" The "$videoName" is running..."
+fi
+
+
+
+
+
+
+
+
+
+
+

huimv-farm-admin/pom.xml

@@ -61,5 +61,14 @@
                 <version>2.6</version>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

huimv-farm-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -20,6 +20,6 @@ import org.springframework.context.annotation.Import;
 @Import(InterceptorConfig.class)
 public class HuimvAdminApplication {
     public static void main(String[] args) {
-        ApplicationContext applicationContext = SpringApplication.run(HuimvAdminApplication.class, args);
+        SpringApplication.run(HuimvAdminApplication.class, args);
     }
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/AppAuthorizeController.java

@@ -0,0 +1,95 @@
+package com.huimv.admin.system.controller;
+
+import com.huimv.admin.system.entity.AppSysMenu;
+import com.huimv.admin.system.entity.Menu;
+import com.huimv.admin.system.service.IAppAuthorizeService;
+import com.huimv.admin.system.service.IAppSysMenuService;
+import com.huimv.admin.system.service.IAuthorizeService;
+import com.huimv.admin.system.service.IMenuService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/app/auth")
+public class AppAuthorizeController {
+
+    @Autowired
+    IAppAuthorizeService iAuthorizeService;
+    @Autowired
+    IAppSysMenuService iMenuService;
+
+    @PostMapping("/saveAccountGroup")
+    public Result saveAccountGroup(@RequestBody Map<String, String> map){
+        /*
+         * 保存账号关联权限组数据
+         */
+        String accountId = map.get("accountId");
+        String groupIds = map.get("groupIds");
+        return iAuthorizeService.saveAccountGroup(accountId,groupIds);
+    }
+
+    @PostMapping("/saveGroupMenu")
+    public Result saveGroupMenu(@RequestBody Map<String, String> map){
+        /*
+         * 保存权限组关联菜单数据
+         */
+        String groupId = map.get("groupId");
+        String menuIds = map.get("menuIds");
+        return iAuthorizeService.saveGroupMenu(groupId,menuIds);
+    }
+
+    @RequestMapping("/getGroupByAccount")
+    public Result getGroupByAccount(@RequestParam(name = "accountId", required = true) String accountId){
+        /*
+         * 根据账号获取权限组
+         */
+        return iAuthorizeService.getGroupByAccount (accountId);
+    }
+
+    @GetMapping("/getMenuByGroup")
+    public Result getMenuByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroup(groupId);
+    }
+
+    @RequestMapping("/getMyMenu")
+    public Result getMyMenuAndButton(@RequestParam(name = "userId", required = true) String userId){
+        /*
+         * 获取用户的菜单数据
+         */
+        List<AppSysMenu> myMenu = iAuthorizeService.getMyMenuAll(userId);
+        List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+//    //获取菜单-多级
+//    @RequestMapping("/getMyMenuMultilevel")
+//    public Result getMyMenuMultilevel(@RequestParam(name = "userId", required = true) String userId){
+//        return new Result(ResultCode.SUCCESS,iAuthorizeService.getMyMenuMultilevel(userId));
+//    }
+
+
+    @GetMapping("/getMyButton")
+    public Result getMyButton(@RequestParam(name = "userId", required = true) Integer userId){
+        /*
+         * 获取用户的菜单数据
+         */
+      List list = iAuthorizeService.getMyButton(userId);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+
+    @GetMapping("/getAcountByGroup")
+    public Result getAccountByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getAccountByGroup(groupId);
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/AppMenuController.java

@@ -0,0 +1,48 @@
+package com.huimv.admin.system.controller;
+
+import com.huimv.admin.system.entity.AppSysMenu;
+import com.huimv.admin.system.entity.Menu;
+import com.huimv.admin.system.service.IAppSysMenuService;
+import com.huimv.admin.system.service.IMenuService;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/app/menu")
+public class AppMenuController {
+    @Autowired
+    private IAppSysMenuService menuService;
+
+    @PostMapping("/add")
+    public Result addMenu(@RequestBody AppSysMenu menu , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        return menuService.addMenu(menu,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result editMenu(@RequestBody AppSysMenu menu){
+        return menuService.editMenu(menu);
+    }
+
+
+    @RequestMapping("/remove")
+    public Result removeMenu(@RequestParam(name = "menuId") Integer menuId){
+        return menuService.removeMenu(menuId);
+    }
+
+    @PostMapping("/list")
+    public Result optimizeList() {
+        return menuService.optimizeList();
+    }
+
+    @PostMapping("/list1")
+    public Result list1() {
+        return menuService.list1();
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/AppSysGroupController.java

@@ -0,0 +1,57 @@
+package com.huimv.admin.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huimv.admin.system.entity.AccountGroup;
+import com.huimv.admin.system.entity.AppSysAccountGroup;
+import com.huimv.admin.system.entity.AppSysGroup;
+import com.huimv.admin.system.entity.Group;
+import com.huimv.admin.system.service.*;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/app/group")
+public class AppSysGroupController {
+
+    @Autowired
+    private IAppSysGroupService groupService;
+
+    @Autowired
+    private IAppSysAccountGroupService accountGroupService;
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @PostMapping("/add")
+    public Result addGroup (@RequestBody AppSysGroup group, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return groupService.addGroup(group,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result updateGroup(@RequestBody AppSysGroup group ){
+        return groupService.updateGroup( group);
+    }
+
+    @RequestMapping("/remove")
+    public Result removeGroup(@RequestParam("groupId") Integer groupId) {
+
+        accountGroupService.remove(new QueryWrapper<AppSysAccountGroup>().in("group_id",groupId));
+        return groupService.removeGroup(groupId);
+    }
+
+    @PostMapping("/list")
+    public IPage<AppSysGroup> listGroup(@RequestBody Map map , HttpServletRequest request) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(userId);
+        return groupService.listGroup(map,allChildId);
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/ClientConfigController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.system.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.system.entity.ClientConfig;
+import com.huimv.admin.system.service.IClientConfigService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/clientConfig")
+public class ClientConfigController {
+    @Autowired
+    private IClientConfigService clientConfigService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody ClientConfig clientConfig){
+        clientConfigService.save(clientConfig);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody ClientConfig clientConfig){
+        QueryWrapper<ClientConfig> farmId = new QueryWrapper<ClientConfig>().eq("farm_id", clientConfig.getFarmId());
+        ClientConfig one = clientConfigService.getOne(farmId);
+        if (ObjectUtil.isEmpty(one)){
+            clientConfigService.save(clientConfig);
+
+        }else {
+            clientConfigService.update(clientConfig,farmId);
+        }
+
+        return new Result(10000,"修改成功",true);
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "id") Integer id){
+        clientConfigService.removeById(id);
+        return new Result(10000,"删除成功",true);
+    }
+
+    @GetMapping("/list")
+    public Result list(@RequestParam(name = "farmId") Integer farmId){
+
+        return new Result(ResultCode.SUCCESS,  clientConfigService.getOne(new QueryWrapper<ClientConfig>().eq("farm_id", farmId)));
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/FarmController.java

@@ -33,6 +33,12 @@ public class FarmController {
         return  farmService.getFarm(userId);
     }
 
+    @GetMapping("/getFarm2")
+    public Result getFarm2(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  farmService.getFarm2(userId);
+    }
+
 
     @PostMapping("/add")
     public Result add(@RequestBody Farm farm, HttpServletRequest request){

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/LoginController.java

@@ -113,13 +113,13 @@ public class LoginController {
         String code = map.get("code");
 
         String remoteHost = req.getRemoteHost();
-        String redisCode = redisTemplate.opsForValue().get(remoteHost);
-        if (redisCode == null) {
-            return  new Result(10005,"验证码过期,点击刷新",false);
-        }
-        if (!redisCode.equals(code.toUpperCase())) {
-            return  new Result(10006,"验证码错误,登录失败",false);
-        }
+//        String redisCode = redisTemplate.opsForValue().get(remoteHost);
+//        if (redisCode == null) {
+//            return  new Result(10005,"验证码过期,点击刷新",false);
+//        }
+//        if (!redisCode.equals(code.toUpperCase())) {
+//            return  new Result(10006,"验证码错误,登录失败",false);
+//        }
         // 未对密码加密
         Result result = iLoginService.loginMultilevel(accountName, password);
         if(result.getCode() == 10000){

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/ScreenAuthorizeController.java

@@ -0,0 +1,92 @@
+package com.huimv.admin.system.controller;
+
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import com.huimv.admin.system.service.IScreenAuthorizeService;
+import com.huimv.admin.system.service.IScreenSysMenuService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/screen/auth")
+public class ScreenAuthorizeController {
+
+    @Autowired
+    IScreenAuthorizeService iAuthorizeService;
+    @Autowired
+    IScreenSysMenuService iMenuService;
+
+    @PostMapping("/saveAccountGroup")
+    public Result saveAccountGroup(@RequestBody Map<String, String> map){
+        /*
+         * 保存账号关联权限组数据
+         */
+        String accountId = map.get("accountId");
+        String groupIds = map.get("groupIds");
+        return iAuthorizeService.saveAccountGroup(accountId,groupIds);
+    }
+
+    @PostMapping("/saveGroupMenu")
+    public Result saveGroupMenu(@RequestBody Map<String, String> map){
+        /*
+         * 保存权限组关联菜单数据
+         */
+        String groupId = map.get("groupId");
+        String menuIds = map.get("menuIds");
+        return iAuthorizeService.saveGroupMenu(groupId,menuIds);
+    }
+
+    @RequestMapping("/getGroupByAccount")
+    public Result getGroupByAccount(@RequestParam(name = "accountId", required = true) String accountId){
+        /*
+         * 根据账号获取权限组
+         */
+        return iAuthorizeService.getGroupByAccount (accountId);
+    }
+
+    @GetMapping("/getMenuByGroup")
+    public Result getMenuByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroup(groupId);
+    }
+
+    @RequestMapping("/getMyMenu")
+    public Result getMyMenuAndButton(@RequestParam(name = "userId", required = true) String userId){
+        /*
+         * 获取用户的菜单数据
+         */
+        List<ScreenSysMenu> myMenu = iAuthorizeService.getMyMenuAll(userId);
+        List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+//    //获取菜单-多级
+//    @RequestMScreening("/getMyMenuMultilevel")
+//    public Result getMyMenuMultilevel(@RequestParam(name = "userId", required = true) String userId){
+//        return new Result(ResultCode.SUCCESS,iAuthorizeService.getMyMenuMultilevel(userId));
+//    }
+
+
+    @GetMapping("/getMyButton")
+    public Result getMyButton(@RequestParam(name = "userId", required = true) Integer userId){
+        /*
+         * 获取用户的菜单数据
+         */
+      List list = iAuthorizeService.getMyButton(userId);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+
+    @GetMapping("/getAcountByGroup")
+    public Result getAccountByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getAccountByGroup(groupId);
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/ScreenMenuController.java

@@ -0,0 +1,46 @@
+package com.huimv.admin.system.controller;
+
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import com.huimv.admin.system.service.IScreenSysMenuService;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/screen/menu")
+public class ScreenMenuController {
+    @Autowired
+    private IScreenSysMenuService menuService;
+
+    @PostMapping("/add")
+    public Result addMenu(@RequestBody ScreenSysMenu menu , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        return menuService.addMenu(menu,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result editMenu(@RequestBody ScreenSysMenu menu){
+        return menuService.editMenu(menu);
+    }
+
+
+    @RequestMapping("/remove")
+    public Result removeMenu(@RequestParam(name = "menuId") Integer menuId){
+        return menuService.removeMenu(menuId);
+    }
+
+    @PostMapping("/list")
+    public Result optimizeList() {
+        return menuService.optimizeList();
+    }
+
+    @PostMapping("/list1")
+    public Result list1() {
+        return menuService.list1();
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/ScreenSysGroupController.java

@@ -0,0 +1,57 @@
+package com.huimv.admin.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+import com.huimv.admin.system.entity.ScreenSysGroup;
+import com.huimv.admin.system.service.IScreenSysAccountGroupService;
+import com.huimv.admin.system.service.IScreenSysGroupService;
+import com.huimv.admin.system.service.ISysAccountMultilevelService;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/screen/group")
+public class ScreenSysGroupController {
+
+    @Autowired
+    private IScreenSysGroupService groupService;
+
+    @Autowired
+    private IScreenSysAccountGroupService accountGroupService;
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @PostMapping("/add")
+    public Result addGroup (@RequestBody ScreenSysGroup group, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return groupService.addGroup(group,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result updateGroup(@RequestBody ScreenSysGroup group ){
+        return groupService.updateGroup( group);
+    }
+
+    @RequestMapping("/remove")
+    public Result removeGroup(@RequestParam("groupId") Integer groupId) {
+
+        accountGroupService.remove(new QueryWrapper<ScreenSysAccountGroup>().in("group_id",groupId));
+        return groupService.removeGroup(groupId);
+    }
+
+    @PostMapping("/list")
+    public IPage<ScreenSysGroup> listGroup(@RequestBody Map map , HttpServletRequest request) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(userId);
+        return groupService.listGroup(map,allChildId);
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/controller/SysAccountMultilevelController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.system.entity.AccountGroup;
 import com.huimv.admin.system.entity.BaseScreenCameraAccount;
 import com.huimv.admin.system.entity.SysAccountMultilevel;
+import com.huimv.admin.system.entity.dto.SysAccountMultilevelDto;
 import com.huimv.admin.system.service.IAccountGroupService;
 import com.huimv.admin.system.service.IBaseScreenCameraAccountService;
 import com.huimv.admin.system.service.ISysAccountMultilevelService;
@@ -70,6 +71,21 @@ public class SysAccountMultilevelController {
 
     }
 
+    @PostMapping("/addApp")
+    public Result addApp(@RequestBody SysAccountMultilevelDto sysAccountMultilevel , HttpServletRequest request){
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return accountMultilevelService.addApp(sysAccountMultilevel,userId);
+
+    }
+    @PostMapping("/updateApp")
+    public Result updateApp(@RequestBody SysAccountMultilevelDto sysAccountMultilevel){
+        accountMultilevelService.updateApp(sysAccountMultilevel);
+
+        return new Result(10000,"修改成功",true);
+
+    }
+
     @PostMapping("/update")
     public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel){
         accountMultilevelService.updateById(sysAccountMultilevel);

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/AppSysAccountGroup.java

@@ -0,0 +1,33 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AppSysAccountGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer accountId;
+
+    private Integer groupId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/AppSysGroup.java

@@ -0,0 +1,35 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AppSysGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String groupName;
+
+    private String remark;
+
+    private Integer accountId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/AppSysGroupMenu.java

@@ -0,0 +1,33 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AppSysGroupMenu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer groupId;
+
+    private Integer menuId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/AppSysMenu.java

@@ -0,0 +1,43 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AppSysMenu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String title;
+
+    private String url;
+
+    private String remark;
+
+    private Integer parentId;
+
+    private Integer sort;
+
+    private Integer weight;
+
+    private String permission;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/ClientConfig.java

@@ -0,0 +1,37 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("base_client_config")
+public class ClientConfig extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private String topName;
+
+    private String bottomName;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/ScreenSysAccountGroup.java

@@ -0,0 +1,33 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ScreenSysAccountGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer accountId;
+
+    private Integer groupId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/ScreenSysGroup.java

@@ -0,0 +1,35 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ScreenSysGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String groupName;
+
+    private String remark;
+
+    private Integer accountId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/ScreenSysGroupMenu.java

@@ -0,0 +1,33 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ScreenSysGroupMenu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer groupId;
+
+    private Integer menuId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/ScreenSysMenu.java

@@ -0,0 +1,43 @@
+package com.huimv.admin.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ScreenSysMenu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String title;
+
+    private String url;
+
+    private String remark;
+
+    private Integer parentId;
+
+    private Integer sort;
+
+    private Integer weight;
+
+    private String permission;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/SysAccountMultilevel.java

@@ -45,4 +45,6 @@ public class SysAccountMultilevel extends Model {
 
     private String userName;
 
+    private Integer screenVideo;
+
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/dto/SysAccountMultilevelDto.java

@@ -0,0 +1,55 @@
+package com.huimv.admin.system.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+public class SysAccountMultilevelDto  {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String account;
+
+    private String password;
+
+    private Integer pid;
+
+    private String pids;
+
+    private Integer accountStatus;
+
+    private String farmIds;
+
+    private String color;
+
+    private Boolean mode;
+
+    private Integer lastFarmId;
+
+    private String userName;
+
+    private List<Integer> pcGroupId;
+
+    private List<Integer> appGroupId;
+
+
+    private List<Integer> screenGroupId;
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/entity/dto/SysAccountMultilevelVo.java

@@ -0,0 +1,47 @@
+package com.huimv.admin.system.entity.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+public class SysAccountMultilevelVo {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String account;
+
+    private String password;
+
+    private Integer pid;
+
+    private String pids;
+
+    private Integer accountStatus;
+
+    private String farmIds;
+
+    private String color;
+
+    private Boolean mode;
+
+    private Integer lastFarmId;
+
+    private String userName;
+
+    private List<Integer> pcGroupId;
+
+    private List<Integer> appGroupId;
+
+    private List<Integer> screenGroupId;
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/AccountGroupMapper.java

@@ -16,5 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
 
-    void removeAccountGroup(@Param("groupIds") String groupIds);
+    void removeAccountGroup(@Param("accountId") String accountId);
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/AppAccountGroupMapper.java

@@ -0,0 +1,17 @@
+package com.huimv.admin.system.mapper;
+
+import com.huimv.admin.system.entity.AppSysAccountGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface AppAccountGroupMapper extends BaseMapper<AppSysAccountGroup> {
+    void removeAccountGroup(@Param("groupIds") String groupIds);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/AppGroupMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.mapper;
+
+import com.huimv.admin.system.entity.AppSysGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface AppGroupMapper extends BaseMapper<AppSysGroup> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/AppGroupMenuMapper.java

@@ -0,0 +1,17 @@
+package com.huimv.admin.system.mapper;
+
+import com.huimv.admin.system.entity.AppSysGroupMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface AppGroupMenuMapper extends BaseMapper<AppSysGroupMenu> {
+    void removeGroupMenu(@Param("groupId") String groupId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/AppMenuMapper.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.system.mapper;
+
+import com.huimv.admin.system.entity.AppSysMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.Menu;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Repository
+public interface AppMenuMapper extends BaseMapper<AppSysMenu> {
+
+    List<AppSysMenu> getMyMenuApp(@Param("accountName") String accountName);
+
+    List<String> getMyButton(@Param("userId") Integer userId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/ClientConfigMapper.java

@@ -0,0 +1,19 @@
+package com.huimv.admin.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.ClientConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface ClientConfigMapper extends BaseMapper<ClientConfig> {
+
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/MenuMapper.java

@@ -3,6 +3,7 @@ package com.huimv.admin.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.admin.system.entity.Menu;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,6 +19,8 @@ import java.util.List;
 @Repository
 public interface MenuMapper extends BaseMapper<Menu> {
 
+
+
     List<Menu> getMyMenu(@Param("accountName") String accountName);
 
     List<String> getMyButton(@Param("userId") Integer userId);

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/ScreenAccountGroupMapper.java

@@ -0,0 +1,17 @@
+package com.huimv.admin.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface ScreenAccountGroupMapper extends BaseMapper<ScreenSysAccountGroup> {
+    void removeAccountGroup(@Param("groupIds") String groupIds);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/ScreenGroupMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.ScreenSysGroup;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface ScreenGroupMapper extends BaseMapper<ScreenSysGroup> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/ScreenGroupMenuMapper.java

@@ -0,0 +1,17 @@
+package com.huimv.admin.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface ScreenGroupMenuMapper extends BaseMapper<ScreenSysGroupMenu> {
+    void removeGroupMenu(@Param("groupId") String groupId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/mapper/ScreenMenuMapper.java

@@ -0,0 +1,24 @@
+package com.huimv.admin.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Repository
+public interface ScreenMenuMapper extends BaseMapper<ScreenSysMenu> {
+
+    List<ScreenSysMenu> getMyMenuApp(@Param("accountName") String accountName);
+
+    List<String> getMyButton(@Param("userId") Integer userId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAppAuthorizeService.java

@@ -0,0 +1,29 @@
+package com.huimv.admin.system.service;
+
+
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+
+public interface IAppAuthorizeService {
+
+    Result saveAccountGroup(String accountId, String groupIds);
+
+    Result saveGroupMenu(String groupId, String menuIds);
+
+
+    Result getMenuByGroup(String groupId);
+
+    Result getGroupByAccount(String accountId);
+
+    Result getAccountByGroup(String groupId);
+
+
+    List getMyMenuAll(String accountName);
+
+    List getMyButton(Integer userId);
+
+    List getMyMenuMultilevel(String userId);
+
+    void saveAccountGroupNew(Integer accountId, String collect1);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAppSysAccountGroupService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.service;
+
+import com.huimv.admin.system.entity.AppSysAccountGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IAppSysAccountGroupService extends IService<AppSysAccountGroup> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAppSysGroupMenuService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.service;
+
+import com.huimv.admin.system.entity.AppSysGroupMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IAppSysGroupMenuService extends IService<AppSysGroupMenu> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAppSysGroupService.java

@@ -0,0 +1,28 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huimv.admin.system.entity.AppSysGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.Group;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IAppSysGroupService extends IService<AppSysGroup> {
+    Result updateGroup(AppSysGroup group);
+
+    Result removeGroup(Integer groupId);
+
+    IPage<AppSysGroup> listGroup(Map map, List<Integer> allChildId);
+
+    Result addGroup(AppSysGroup group, Integer userId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAppSysMenuService.java

@@ -0,0 +1,36 @@
+package com.huimv.admin.system.service;
+
+import com.huimv.admin.system.entity.AppSysMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.Menu;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IAppSysMenuService extends IService<AppSysMenu> {
+    Result addMenu(AppSysMenu menu, Integer userId);
+    //修改菜单
+    Result editMenu(AppSysMenu menu);
+    //删除菜单(批量)
+    Result removeMenu(Integer menuId);
+   /* //查询所有
+    List<Map> listMenu();
+    //菜单递归
+    List listMenuUtil(List<Menu> list);*/
+
+    //优化查询所有
+    Result optimizeList();
+    //优化菜单递归
+    List<Map> optimizeListUtil(int parentId, List<AppSysMenu> menuEntityList);
+
+    Result list1();
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IAuthorizeService.java

@@ -24,4 +24,6 @@ public interface IAuthorizeService {
     List getMyButton(Integer userId);
 
     List getMyMenuMultilevel(String userId);
+
+    void saveAccountGroupNew(Integer accountId, String collect);
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IClientConfigService.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.Account;
+import com.huimv.admin.system.entity.ClientConfig;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+public interface IClientConfigService extends IService<ClientConfig> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IFarmService.java

@@ -17,4 +17,6 @@ public interface IFarmService extends IService<Farm> {
     Result getFarm(Integer userId);
 
     Result add(Farm farm);
+
+    Result getFarm2(Integer userId);
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IScreenAuthorizeService.java

@@ -0,0 +1,29 @@
+package com.huimv.admin.system.service;
+
+
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+
+public interface IScreenAuthorizeService {
+
+    Result saveAccountGroup(String accountId, String groupIds);
+
+    Result saveGroupMenu(String groupId, String menuIds);
+
+
+    Result getMenuByGroup(String groupId);
+
+    Result getGroupByAccount(String accountId);
+
+    Result getAccountByGroup(String groupId);
+
+
+    List getMyMenuAll(String accountName);
+
+    List getMyButton(Integer userId);
+
+    List getMyMenuMultilevel(String userId);
+
+    void saveAccountGroupNew(Integer accountId, String collect1);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IScreenSysAccountGroupService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IScreenSysAccountGroupService extends IService<ScreenSysAccountGroup> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IScreenSysGroupMenuService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IScreenSysGroupMenuService extends IService<ScreenSysGroupMenu> {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IScreenSysGroupService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.ScreenSysGroup;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IScreenSysGroupService extends IService<ScreenSysGroup> {
+    Result updateGroup(ScreenSysGroup group);
+
+    Result removeGroup(Integer groupId);
+
+    IPage<ScreenSysGroup> listGroup(Map map, List<Integer> allChildId);
+
+    Result addGroup(ScreenSysGroup group, Integer userId);
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/IScreenSysMenuService.java

@@ -0,0 +1,35 @@
+package com.huimv.admin.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+public interface IScreenSysMenuService extends IService<ScreenSysMenu> {
+    Result addMenu(ScreenSysMenu menu, Integer userId);
+    //修改菜单
+    Result editMenu(ScreenSysMenu menu);
+    //删除菜单(批量)
+    Result removeMenu(Integer menuId);
+   /* //查询所有
+    List<Map> listMenu();
+    //菜单递归
+    List listMenuUtil(List<Menu> list);*/
+
+    //优化查询所有
+    Result optimizeList();
+    //优化菜单递归
+    List<Map> optimizeListUtil(int parentId, List<ScreenSysMenu> menuEntityList);
+
+    Result list1();
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/ISysAccountMultilevelService.java

@@ -2,6 +2,7 @@ package com.huimv.admin.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.system.entity.SysAccountMultilevel;
+import com.huimv.admin.system.entity.dto.SysAccountMultilevelDto;
 import com.huimv.common.utils.Result;
 
 import java.util.List;
@@ -27,4 +28,8 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
     Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer userId);
 
     Result getLastFarmId(Integer userId);
+
+    Result addApp(SysAccountMultilevelDto sysAccountMultilevel, Integer userId);
+
+    void updateApp(SysAccountMultilevelDto sysAccountMultilevel);
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AppAuthorizeServiceImpl.java

@@ -0,0 +1,242 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.system.entity.*;
+import com.huimv.admin.system.mapper.*;
+import com.huimv.admin.system.service.IAppAuthorizeService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AppAuthorizeServiceImpl implements IAppAuthorizeService {
+
+    @Autowired
+    private AppAccountGroupMapper accountGroupMapper;
+    @Autowired
+    private AppGroupMenuMapper groupMenuMapper;
+    @Autowired
+    private AppMenuMapper menuMapper;
+    
+    @Override
+    @Transactional
+    public Result saveAccountGroup(String accountId, String groupIds) {
+        /**
+         * Step1:先删除原先的账号关联权限组数据；
+         * Step2:再添加新的账号关联权限组数据；
+         */
+
+        if (accountId == null||"".equals(accountId)){
+            String[] groupIdArray = accountId.split(",");
+            Integer groupId = accountGroupMapper.selectCount(new QueryWrapper<AppSysAccountGroup>().in("group_id", groupIdArray));
+            if (groupId >0 ){
+                accountGroupMapper.removeAccountGroup(groupIds);
+            }
+
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }else {
+            String[] groupIdArray = accountId.split(",");
+            Integer groupId = accountGroupMapper.selectCount(new QueryWrapper<AppSysAccountGroup>().in("group_id", groupIdArray));
+            if (groupId >0 ){
+                accountGroupMapper.removeAccountGroup(groupIds);
+            }
+
+//        for (int a = 0; a < groupIdArray.length; a++) {
+//            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
+//        }
+            for (int a = 0; a < groupIdArray.length; a++) {
+                String[] split = groupIds.split(",");
+                for (String s : split) {
+                    AppSysAccountGroup accountGroupEntity = new AppSysAccountGroup();
+                    accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
+                    accountGroupEntity.setGroupId(Integer.parseInt(s));
+                    accountGroupMapper.insert(accountGroupEntity);
+                }
+
+//            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
+            }
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }
+
+
+    }
+
+    @Override
+    @Transactional
+    public Result saveGroupMenu(String groupId, String menuIds) {
+        /**
+         * Step1:先删除原先的权限组关联菜单数据；
+         * Step2:再添加新的账号权限组关联菜单数据；
+         */
+        Integer integer = groupMenuMapper.selectCount(new QueryWrapper<AppSysGroupMenu>().eq("group_id", groupId));
+        if (integer >0 ){
+            groupMenuMapper.removeGroupMenu(groupId);
+        }
+
+        if (StringUtils.isNotBlank(menuIds)){
+            String[] menuIdsArray = menuIds.split(",");
+            for (int a = 0; a < menuIdsArray.length; a++) {
+
+                AppSysGroupMenu GroupMenu = new AppSysGroupMenu();
+                GroupMenu.setGroupId(Integer.parseInt(groupId));
+                GroupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
+                groupMenuMapper.insert(GroupMenu);
+            }
+        }
+
+        return new Result(10001, "保存权限组关联菜单成功", true);
+    }
+
+
+
+
+
+    @Override
+    public Result getMenuByGroup(String groupId) {
+        /* 根据权限组读取已关联菜单 */
+        QueryWrapper<AppSysGroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+        groupMenuQueryWrapper.eq("group_id",groupId);
+        List<AppSysGroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
+        }
+        /* 读取所有菜单 */
+        List<AppSysMenu> allMenuList = menuMapper.selectList(null);
+        if (allMenuList.size() == 0) {
+            return new Result(10007, "当前无任何菜单.", false);
+        }
+        List<GroupMenu> newList = new ArrayList();
+        StringBuilder idSb2 = new StringBuilder();
+
+        for (int a = 0; a < groupMenuEntityList.size(); a++) {
+            AppSysGroupMenu groupMenuEntity = groupMenuEntityList.get(a);
+            for (AppSysMenu menuEntity : allMenuList) {
+                if (menuEntity.getId().equals(groupMenuEntity.getMenuId())) {
+                    if (menuEntity.getParentId() == 0) {
+                        if (idSb2.length() > 0) {
+                            idSb2.append(",");
+                        }
+                        idSb2.append(groupMenuEntity.getMenuId());
+                        break;
+                    } else {
+                        boolean isChild = false;
+                        for (AppSysMenu menuEntity2 : allMenuList) {
+                            if (menuEntity2.getParentId().equals(groupMenuEntity.getMenuId())) {
+                                isChild = true;
+                                break;
+                            }
+                        }
+                        if (!isChild) {
+                            if (idSb2.length() > 0) {
+                                idSb2.append(",");
+                            }
+                            idSb2.append(groupMenuEntity.getMenuId());
+                        }
+                        break;
+                    }
+                }
+            }
+
+        }
+
+//        StringBuilder idSb = new StringBuilder();
+//        for (GroupMenu groupMenuEntity : groupMenuEntityList) {
+//            if (idSb.length() > 0) {
+//                idSb.append(",");
+//            }
+//            idSb.append(groupMenuEntity.getMenuId());
+//        }
+        return new Result(ResultCode.SUCCESS, idSb2.toString());
+    }
+
+    /**
+     * @param accountId
+     * @return
+     */
+    @Override
+    public Result getGroupByAccount(String accountId) {
+        /* 根据账号id读取已关联权限组 */
+        QueryWrapper<AppSysAccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("account_id",accountId);
+        List<AppSysAccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前用户账号暂未关联任何权限组.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (AppSysAccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getGroupId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+    @Override
+    public Result getAccountByGroup(String groupId) {
+        /* 根据账号id读取已关联权限组 */
+
+        QueryWrapper<AppSysAccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("group_id",groupId);
+        List<AppSysAccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前权限组暂未关联任何用户账号.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (AppSysAccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getAccountId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+    @Override
+    public List getMyMenuAll(String accountName) {
+        if ("1".equals(accountName)){
+            List<AppSysMenu> menus = menuMapper.selectList(new QueryWrapper<AppSysMenu>().orderByAsc("sort"));
+            return menus;
+        }
+
+        return menuMapper.getMyMenuApp(accountName);
+    }
+
+    @Override
+    public List<String> getMyButton(Integer userId) {
+        if (userId == 1){
+            List<AppSysMenu> menus = menuMapper.selectList(null);
+            List<String> list = new ArrayList<>();
+            for (AppSysMenu menu : menus) {
+                list.add(menu.getPermission());
+            }
+            return list;
+        }
+
+        return menuMapper.getMyButton(userId);
+    }
+
+    @Override
+    public List getMyMenuMultilevel(String userId) {
+        return null;
+    }
+
+    @Transactional
+    @Override
+    public void saveAccountGroupNew(Integer accountId, String collect) {
+        accountGroupMapper.delete(new QueryWrapper<AppSysAccountGroup>().eq("account_id",accountId));
+        String[] split = collect.split(",");
+        for (String s : split) {
+            AppSysAccountGroup accountGroup = new AppSysAccountGroup();
+            accountGroup.setGroupId(Integer.parseInt(s));
+            accountGroup.setAccountId(accountId);
+            accountGroupMapper.insert(accountGroup);
+        }
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AppSysAccountGroupServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.system.service.impl;
+
+import com.huimv.admin.system.entity.AppSysAccountGroup;
+import com.huimv.admin.system.mapper.AppAccountGroupMapper;
+import com.huimv.admin.system.service.IAppSysAccountGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class AppSysAccountGroupServiceImpl extends ServiceImpl<AppAccountGroupMapper, AppSysAccountGroup> implements IAppSysAccountGroupService {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AppSysGroupMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.system.service.impl;
+
+import com.huimv.admin.system.entity.AppSysGroupMenu;
+import com.huimv.admin.system.mapper.AppGroupMenuMapper;
+import com.huimv.admin.system.service.IAppSysGroupMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class AppSysGroupMenuServiceImpl extends ServiceImpl<AppGroupMenuMapper, AppSysGroupMenu> implements IAppSysGroupMenuService {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AppSysGroupServiceImpl.java

@@ -0,0 +1,85 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.system.entity.AppSysGroup;
+import com.huimv.admin.system.entity.AppSysGroupMenu;
+import com.huimv.admin.system.mapper.AppGroupMapper;
+import com.huimv.admin.system.mapper.AppGroupMenuMapper;
+import com.huimv.admin.system.service.IAppSysGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class AppSysGroupServiceImpl extends ServiceImpl<AppGroupMapper, AppSysGroup> implements IAppSysGroupService {
+    @Autowired
+    private AppGroupMapper groupMapper;
+    @Autowired
+    private AppGroupMenuMapper groupMenuMapper;
+
+
+    @Override
+    public Result updateGroup(@RequestBody AppSysGroup group) {
+        try {
+            groupMapper.updateById(group);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+    }
+
+    @Override
+    @Transactional
+    public Result removeGroup(Integer groupId) {
+        try {
+            AppSysGroup group = this.groupMapper.selectById(groupId);
+            if (group == null) {
+                return new Result(10002,"请选择数据",false);
+            }
+            // 删除权限组
+            this.groupMapper.deleteById(groupId);
+            // 删除权限组关联菜单
+            QueryWrapper<AppSysGroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+            groupMenuQueryWrapper.eq("group_id",groupId);
+            groupMenuMapper.delete(groupMenuQueryWrapper);
+            return new Result(10000,"删除成功",true);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+    }
+
+    @Override
+    public IPage<AppSysGroup> listGroup(Map map, List<Integer> allChildId) {
+        Integer pageNum = (Integer)map.get("pageNum");
+        Integer pageSize = (Integer)map.get("pageSize");
+
+        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<AppSysGroup>().in("account_id",allChildId).orderByDesc("id"));
+    }
+
+    @Override
+    public Result addGroup(AppSysGroup group, Integer userId) {
+        try {
+            group.setAccountId(userId);
+            groupMapper.insert(group);
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AppSysMenuServiceImpl.java

@@ -0,0 +1,152 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.system.entity.*;
+import com.huimv.admin.system.mapper.*;
+import com.huimv.admin.system.service.IAppSysMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class AppSysMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppSysMenu> implements IAppSysMenuService {
+    @Autowired
+    private AppMenuMapper menuMapper;
+
+    @Autowired
+    private AppAccountGroupMapper accountGroupMapper;
+
+    @Autowired
+    private AppGroupMenuMapper groupMenuMapper;
+
+    @Override
+    public Result addMenu(AppSysMenu menu, Integer userId) {
+
+        try {
+            if (menu == null){
+                return  new Result(10002,"参数错误",false);
+            }
+
+            menuMapper.insert(menu);
+            Integer id = menu.getId();
+            List<AppSysAccountGroup> accounts = accountGroupMapper.selectList(new QueryWrapper<AppSysAccountGroup>().eq("account_id", userId));
+            for (AppSysAccountGroup account : accounts) {
+                AppSysGroupMenu groupMenu = new AppSysGroupMenu();
+                groupMenu.setGroupId(account.getGroupId());
+                groupMenu.setMenuId(id);
+                groupMenuMapper.insert(groupMenu);
+            }
+
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+
+    @Override
+    public Result editMenu(AppSysMenu menu) {
+        try {
+            if (menu.getId() == null){
+                return new Result(10002,"请选择要修改的菜单",false);
+            }
+            menuMapper.updateById(menu);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+
+    }
+
+    @Override
+    public Result removeMenu(Integer menuId) {
+        try {
+            QueryWrapper<AppSysMenu> menuQueryWrapper = new QueryWrapper<>();
+            menuQueryWrapper.eq("parent_id",menuId);
+            List<AppSysMenu> lists = menuMapper.selectList(menuQueryWrapper);
+            if (lists != null && lists.size()>0){
+                for (AppSysMenu menu : lists) {
+                    removeMenu(menu.getId());
+                    menuMapper.deleteById(menu);
+                }
+            }
+            menuMapper.deleteById(menuId);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+        return new Result(10000,"删除成功",true);
+    }
+
+    //查询菜单，只查一次数据库
+    @Override
+    public Result optimizeList() {
+        QueryWrapper<AppSysMenu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+
+        List<AppSysMenu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result list1() {
+        QueryWrapper<AppSysMenu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+        menuQueryWrapper.eq("weight",0);
+        List<AppSysMenu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public List<Map> optimizeListUtil(int parentId, List<AppSysMenu> menuEntityList){
+        List<Map> list = new ArrayList<>();
+        for (AppSysMenu menuEntity : menuEntityList) {
+            if (menuEntity.getParentId() == parentId){
+                Map map = new HashMap();
+                map.put("id", menuEntity.getId());
+                map.put("title", menuEntity.getTitle());
+                map.put("parentId", menuEntity.getParentId());
+                map.put("url", menuEntity.getUrl());
+                map.put("sort", menuEntity.getSort());
+                map.put("value", menuEntity.getId());
+                map.put("pid", menuEntity.getParentId());
+                map.put("permission", menuEntity.getPermission());
+                map.put("weight", menuEntity.getWeight());
+                if (menuEntityIsChildren(menuEntity,menuEntityList) ){
+                    map.put("children",optimizeListUtil(menuEntity.getId(),menuEntityList));
+                }else {
+                    map.put("children",new ArrayList<>());
+                }
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+
+
+    //判断是否有children
+    private boolean menuEntityIsChildren(AppSysMenu menuEntity, List<AppSysMenu> menuEntityList) {
+        for (AppSysMenu Menu : menuEntityList) {
+            if (menuEntity.getId().equals(Menu.getParentId()) ){
+                return true;
+            }
+        }
+        return false;
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/AuthorizeServiceImpl.java

@@ -37,19 +37,23 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
          */
         if (accountId == null||"".equals(accountId)){
 
-            accountGroupMapper.removeAccountGroup(groupIds);
+            accountGroupMapper.removeAccountGroup(accountId);
             return new Result(10001, "保存账号关联权限组成功", true);
         }else {
             String[] groupIdArray = accountId.split(",");
-            accountGroupMapper.removeAccountGroup(groupIds);
+
+            accountGroupMapper.removeAccountGroup(accountId);
 //        for (int a = 0; a < groupIdArray.length; a++) {
 //            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
 //        }
             for (int a = 0; a < groupIdArray.length; a++) {
-                AccountGroup accountGroupEntity = new AccountGroup();
-                accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
-                accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
-                accountGroupMapper.insert(accountGroupEntity);
+                String[] split = groupIds.split(",");
+                for (String s : split) {
+                    AccountGroup accountGroupEntity = new AccountGroup();
+                    accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
+                    accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
+                    accountGroupMapper.insert(accountGroupEntity);
+                }
 //            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
             }
             return new Result(10001, "保存账号关联权限组成功", true);
@@ -212,4 +216,17 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         return null;
     }
 
+    @Transactional
+    @Override
+    public void saveAccountGroupNew(Integer accountId, String collect) {
+        accountGroupMapper.delete(new QueryWrapper<AccountGroup>().eq("account_id",accountId));
+        String[] split = collect.split(",");
+        for (String s : split) {
+            AccountGroup accountGroup = new AccountGroup();
+            accountGroup.setGroupId(Integer.parseInt(s));
+            accountGroup.setAccountId(accountId);
+            accountGroupMapper.insert(accountGroup);
+        }
+    }
+
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ClientConfigServiceImpl.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.BaseFarmX;
+import com.huimv.admin.system.entity.ClientConfig;
+import com.huimv.admin.system.mapper.BaseFarmXMapper;
+import com.huimv.admin.system.mapper.ClientConfigMapper;
+import com.huimv.admin.system.service.IBaseFarmXService;
+import com.huimv.admin.system.service.IClientConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-17
+ */
+@Service
+public class ClientConfigServiceImpl extends ServiceImpl<ClientConfigMapper, ClientConfig> implements IClientConfigService {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/FarmServiceImpl.java

@@ -47,4 +47,25 @@ public class FarmServiceImpl extends ServiceImpl<FarmMapper, Farm> implements IF
 
         return new Result(10000,"添加成功",true);
     }
+
+    @Override
+    public Result getFarm2(Integer userId) {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        List<Farm> list ;
+        if (userId == 1){
+            list = this.list();
+        }else {
+            List<String> list1 = Arrays.asList(farmIds.split(","));
+            list = this.listByIds(list1);
+        }
+        String str = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q";
+        String[] split = str.split(",");
+        Integer i = 0;
+        for (Farm farm : list) {
+            farm.setFarmName(split[i]+"牧场");
+            i++;
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ScreenAuthorizeServiceImpl.java

@@ -0,0 +1,247 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import com.huimv.admin.system.entity.GroupMenu;
+import com.huimv.admin.system.mapper.ScreenAccountGroupMapper;
+import com.huimv.admin.system.mapper.ScreenGroupMenuMapper;
+import com.huimv.admin.system.mapper.ScreenMenuMapper;
+import com.huimv.admin.system.service.IScreenAuthorizeService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class ScreenAuthorizeServiceImpl implements IScreenAuthorizeService {
+
+    @Autowired
+    private ScreenAccountGroupMapper accountGroupMapper;
+    @Autowired
+    private ScreenGroupMenuMapper groupMenuMapper;
+    @Autowired
+    private ScreenMenuMapper menuMapper;
+    
+    @Override
+    @Transactional
+    public Result saveAccountGroup(String accountId, String groupIds) {
+        /**
+         * Step1:先删除原先的账号关联权限组数据；
+         * Step2:再添加新的账号关联权限组数据；
+         */
+
+        if (accountId == null||"".equals(accountId)){
+            String[] groupIdArray = accountId.split(",");
+            Integer groupId = accountGroupMapper.selectCount(new QueryWrapper<ScreenSysAccountGroup>().in("group_id", groupIdArray));
+            if (groupId >0 ){
+                accountGroupMapper.removeAccountGroup(groupIds);
+            }
+
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }else {
+            String[] groupIdArray = accountId.split(",");
+            Integer groupId = accountGroupMapper.selectCount(new QueryWrapper<ScreenSysAccountGroup>().in("group_id", groupIdArray));
+            if (groupId >0 ){
+                accountGroupMapper.removeAccountGroup(groupIds);
+            }
+
+//        for (int a = 0; a < groupIdArray.length; a++) {
+//            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
+//        }
+            for (int a = 0; a < groupIdArray.length; a++) {
+                String[] split = groupIds.split(",");
+                for (String s : split) {
+                    ScreenSysAccountGroup accountGroupEntity = new ScreenSysAccountGroup();
+                    accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
+                    accountGroupEntity.setGroupId(Integer.parseInt(s));
+                    accountGroupMapper.insert(accountGroupEntity);
+                }
+
+//            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
+            }
+            return new Result(10001, "保存账号关联权限组成功", true);
+        }
+
+
+    }
+
+    @Override
+    @Transactional
+    public Result saveGroupMenu(String groupId, String menuIds) {
+        /**
+         * Step1:先删除原先的权限组关联菜单数据；
+         * Step2:再添加新的账号权限组关联菜单数据；
+         */
+        Integer integer = groupMenuMapper.selectCount(new QueryWrapper<ScreenSysGroupMenu>().eq("group_id", groupId));
+        if (integer >0 ){
+            groupMenuMapper.removeGroupMenu(groupId);
+        }
+
+        if (StringUtils.isNotBlank(menuIds)){
+            String[] menuIdsArray = menuIds.split(",");
+            for (int a = 0; a < menuIdsArray.length; a++) {
+
+                ScreenSysGroupMenu GroupMenu = new ScreenSysGroupMenu();
+                GroupMenu.setGroupId(Integer.parseInt(groupId));
+                GroupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
+                groupMenuMapper.insert(GroupMenu);
+            }
+        }
+
+        return new Result(10001, "保存权限组关联菜单成功", true);
+    }
+
+
+
+
+
+    @Override
+    public Result getMenuByGroup(String groupId) {
+        /* 根据权限组读取已关联菜单 */
+        QueryWrapper<ScreenSysGroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+        groupMenuQueryWrapper.eq("group_id",groupId);
+        List<ScreenSysGroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
+        }
+        /* 读取所有菜单 */
+        List<ScreenSysMenu> allMenuList = menuMapper.selectList(null);
+        if (allMenuList.size() == 0) {
+            return new Result(10007, "当前无任何菜单.", false);
+        }
+        List<GroupMenu> newList = new ArrayList();
+        StringBuilder idSb2 = new StringBuilder();
+
+        for (int a = 0; a < groupMenuEntityList.size(); a++) {
+            ScreenSysGroupMenu groupMenuEntity = groupMenuEntityList.get(a);
+            for (ScreenSysMenu menuEntity : allMenuList) {
+                if (menuEntity.getId().equals(groupMenuEntity.getMenuId())) {
+                    if (menuEntity.getParentId() == 0) {
+                        if (idSb2.length() > 0) {
+                            idSb2.append(",");
+                        }
+                        idSb2.append(groupMenuEntity.getMenuId());
+                        break;
+                    } else {
+                        boolean isChild = false;
+                        for (ScreenSysMenu menuEntity2 : allMenuList) {
+                            if (menuEntity2.getParentId().equals(groupMenuEntity.getMenuId())) {
+                                isChild = true;
+                                break;
+                            }
+                        }
+                        if (!isChild) {
+                            if (idSb2.length() > 0) {
+                                idSb2.append(",");
+                            }
+                            idSb2.append(groupMenuEntity.getMenuId());
+                        }
+                        break;
+                    }
+                }
+            }
+
+        }
+
+//        StringBuilder idSb = new StringBuilder();
+//        for (GroupMenu groupMenuEntity : groupMenuEntityList) {
+//            if (idSb.length() > 0) {
+//                idSb.append(",");
+//            }
+//            idSb.append(groupMenuEntity.getMenuId());
+//        }
+        return new Result(ResultCode.SUCCESS, idSb2.toString());
+    }
+
+    /**
+     * @param accountId
+     * @return
+     */
+    @Override
+    public Result getGroupByAccount(String accountId) {
+        /* 根据账号id读取已关联权限组 */
+        QueryWrapper<ScreenSysAccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("account_id",accountId);
+        List<ScreenSysAccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前用户账号暂未关联任何权限组.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (ScreenSysAccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getGroupId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+    @Override
+    public Result getAccountByGroup(String groupId) {
+        /* 根据账号id读取已关联权限组 */
+
+        QueryWrapper<ScreenSysAccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("group_id",groupId);
+        List<ScreenSysAccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前权限组暂未关联任何用户账号.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (ScreenSysAccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getAccountId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+    @Override
+    public List getMyMenuAll(String accountName) {
+        if ("1".equals(accountName)){
+            List<ScreenSysMenu> menus = menuMapper.selectList(new QueryWrapper<ScreenSysMenu>().orderByAsc("sort"));
+            return menus;
+        }
+
+        return menuMapper.getMyMenuApp(accountName);
+    }
+
+    @Override
+    public List<String> getMyButton(Integer userId) {
+        if (userId == 1){
+            List<ScreenSysMenu> menus = menuMapper.selectList(null);
+            List<String> list = new ArrayList<>();
+            for (ScreenSysMenu menu : menus) {
+                list.add(menu.getPermission());
+            }
+            return list;
+        }
+
+        return menuMapper.getMyButton(userId);
+    }
+
+    @Override
+    public List getMyMenuMultilevel(String userId) {
+        return null;
+    }
+
+    @Transactional
+    @Override
+    public void saveAccountGroupNew(Integer accountId, String collect) {
+        accountGroupMapper.delete(new QueryWrapper<ScreenSysAccountGroup>().eq("account_id",accountId));
+        String[] split = collect.split(",");
+        for (String s : split) {
+            ScreenSysAccountGroup accountGroup = new ScreenSysAccountGroup();
+            accountGroup.setGroupId(Integer.parseInt(s));
+            accountGroup.setAccountId(accountId);
+            accountGroupMapper.insert(accountGroup);
+        }
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ScreenSysAccountGroupServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+import com.huimv.admin.system.mapper.ScreenAccountGroupMapper;
+import com.huimv.admin.system.service.IScreenSysAccountGroupService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class ScreenSysAccountGroupServiceImpl extends ServiceImpl<ScreenAccountGroupMapper, ScreenSysAccountGroup> implements IScreenSysAccountGroupService {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ScreenSysGroupMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+import com.huimv.admin.system.mapper.ScreenGroupMenuMapper;
+import com.huimv.admin.system.service.IScreenSysGroupMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class ScreenSysGroupMenuServiceImpl extends ServiceImpl<ScreenGroupMenuMapper, ScreenSysGroupMenu> implements IScreenSysGroupMenuService {
+
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ScreenSysGroupServiceImpl.java

@@ -0,0 +1,85 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.ScreenSysGroup;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+import com.huimv.admin.system.mapper.ScreenGroupMapper;
+import com.huimv.admin.system.mapper.ScreenGroupMenuMapper;
+import com.huimv.admin.system.service.IScreenSysGroupService;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class ScreenSysGroupServiceImpl extends ServiceImpl<ScreenGroupMapper, ScreenSysGroup> implements IScreenSysGroupService {
+    @Autowired
+    private ScreenGroupMapper groupMapper;
+    @Autowired
+    private ScreenGroupMenuMapper groupMenuMapper;
+
+
+    @Override
+    public Result updateGroup(@RequestBody ScreenSysGroup group) {
+        try {
+            groupMapper.updateById(group);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+    }
+
+    @Override
+    @Transactional
+    public Result removeGroup(Integer groupId) {
+        try {
+            ScreenSysGroup group = this.groupMapper.selectById(groupId);
+            if (group == null) {
+                return new Result(10002,"请选择数据",false);
+            }
+            // 删除权限组
+            this.groupMapper.deleteById(groupId);
+            // 删除权限组关联菜单
+            QueryWrapper<ScreenSysGroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+            groupMenuQueryWrapper.eq("group_id",groupId);
+            groupMenuMapper.delete(groupMenuQueryWrapper);
+            return new Result(10000,"删除成功",true);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+    }
+
+    @Override
+    public IPage<ScreenSysGroup> listGroup(Map map, List<Integer> allChildId) {
+        Integer pageNum = (Integer)map.get("pageNum");
+        Integer pageSize = (Integer)map.get("pageSize");
+
+        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<ScreenSysGroup>().in("account_id",allChildId).orderByDesc("id"));
+    }
+
+    @Override
+    public Result addGroup(ScreenSysGroup group, Integer userId) {
+        try {
+            group.setAccountId(userId);
+            groupMapper.insert(group);
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/ScreenSysMenuServiceImpl.java

@@ -0,0 +1,156 @@
+package com.huimv.admin.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
+import com.huimv.admin.system.entity.ScreenSysGroupMenu;
+import com.huimv.admin.system.entity.ScreenSysMenu;
+import com.huimv.admin.system.mapper.ScreenAccountGroupMapper;
+import com.huimv.admin.system.mapper.ScreenGroupMenuMapper;
+import com.huimv.admin.system.mapper.ScreenMenuMapper;
+import com.huimv.admin.system.service.IScreenSysMenuService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-03-25
+ */
+@Service
+public class ScreenSysMenuServiceImpl extends ServiceImpl<ScreenMenuMapper, ScreenSysMenu> implements IScreenSysMenuService {
+    @Autowired
+    private ScreenMenuMapper menuMapper;
+
+    @Autowired
+    private ScreenAccountGroupMapper accountGroupMapper;
+
+    @Autowired
+    private ScreenGroupMenuMapper groupMenuMapper;
+
+    @Override
+    public Result addMenu(ScreenSysMenu menu, Integer userId) {
+
+        try {
+            if (menu == null){
+                return  new Result(10002,"参数错误",false);
+            }
+
+            menuMapper.insert(menu);
+            Integer id = menu.getId();
+            List<ScreenSysAccountGroup> accounts = accountGroupMapper.selectList(new QueryWrapper<ScreenSysAccountGroup>().eq("account_id", userId));
+            for (ScreenSysAccountGroup account : accounts) {
+                ScreenSysGroupMenu groupMenu = new ScreenSysGroupMenu();
+                groupMenu.setGroupId(account.getGroupId());
+                groupMenu.setMenuId(id);
+                groupMenuMapper.insert(groupMenu);
+            }
+
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+
+    @Override
+    public Result editMenu(ScreenSysMenu menu) {
+        try {
+            if (menu.getId() == null){
+                return new Result(10002,"请选择要修改的菜单",false);
+            }
+            menuMapper.updateById(menu);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+
+    }
+
+    @Override
+    public Result removeMenu(Integer menuId) {
+        try {
+            QueryWrapper<ScreenSysMenu> menuQueryWrapper = new QueryWrapper<>();
+            menuQueryWrapper.eq("parent_id",menuId);
+            List<ScreenSysMenu> lists = menuMapper.selectList(menuQueryWrapper);
+            if (lists != null && lists.size()>0){
+                for (ScreenSysMenu menu : lists) {
+                    removeMenu(menu.getId());
+                    menuMapper.deleteById(menu);
+                }
+            }
+            menuMapper.deleteById(menuId);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+        return new Result(10000,"删除成功",true);
+    }
+
+    //查询菜单，只查一次数据库
+    @Override
+    public Result optimizeList() {
+        QueryWrapper<ScreenSysMenu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+
+        List<ScreenSysMenu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result list1() {
+        QueryWrapper<ScreenSysMenu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+        menuQueryWrapper.eq("weight",0);
+        List<ScreenSysMenu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public List<Map> optimizeListUtil(int parentId, List<ScreenSysMenu> menuEntityList){
+        List<Map> list = new ArrayList<>();
+        for (ScreenSysMenu menuEntity : menuEntityList) {
+            if (menuEntity.getParentId() == parentId){
+                Map map = new HashMap();
+                map.put("id", menuEntity.getId());
+                map.put("title", menuEntity.getTitle());
+                map.put("parentId", menuEntity.getParentId());
+                map.put("url", menuEntity.getUrl());
+                map.put("sort", menuEntity.getSort());
+                map.put("value", menuEntity.getId());
+                map.put("pid", menuEntity.getParentId());
+                map.put("permission", menuEntity.getPermission());
+                map.put("weight", menuEntity.getWeight());
+                if (menuEntityIsChildren(menuEntity,menuEntityList) ){
+                    map.put("children",optimizeListUtil(menuEntity.getId(),menuEntityList));
+                }else {
+                    map.put("children",new ArrayList<>());
+                }
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+
+
+    //判断是否有children
+    private boolean menuEntityIsChildren(ScreenSysMenu menuEntity, List<ScreenSysMenu> menuEntityList) {
+        for (ScreenSysMenu Menu : menuEntityList) {
+            if (menuEntity.getId().equals(Menu.getParentId()) ){
+                return true;
+            }
+        }
+        return false;
+    }
+}

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/SysAccountMultilevelServiceImpl.java

@@ -1,20 +1,31 @@
 package com.huimv.admin.system.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.system.entity.AccountGroup;
+import com.huimv.admin.system.entity.AppSysAccountGroup;
+import com.huimv.admin.system.entity.ScreenSysAccountGroup;
 import com.huimv.admin.system.entity.SysAccountMultilevel;
+import com.huimv.admin.system.entity.dto.SysAccountMultilevelDto;
+import com.huimv.admin.system.entity.dto.SysAccountMultilevelVo;
+import com.huimv.admin.system.mapper.AccountGroupMapper;
+import com.huimv.admin.system.mapper.AppAccountGroupMapper;
+import com.huimv.admin.system.mapper.ScreenAccountGroupMapper;
 import com.huimv.admin.system.mapper.SysAccountMultilevelMapper;
-import com.huimv.admin.system.service.ISysAccountMultilevelService;
+import com.huimv.admin.system.service.*;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,6 +41,16 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
     @Autowired
     private SysAccountMultilevelMapper accountMultilevelMapper;
 
+
+    @Autowired
+    AppAccountGroupMapper appAccountGroupMapper;
+
+    @Autowired
+    AccountGroupMapper pcAccountGroupMapper;
+
+    @Autowired
+    ScreenAccountGroupMapper screenAccountGroupMapper;
+
     @Override
     public Result findUserAccount(String searchStr, int pageNum, int pageSize, Integer userId) {
 
@@ -99,7 +120,37 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         }
 
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        List<SysAccountMultilevel> records = page.getRecords();
+        List<SysAccountMultilevelVo> list = new ArrayList<>();
+        for (SysAccountMultilevel record : records) {
+            SysAccountMultilevelVo accountMultilevelVo = new SysAccountMultilevelVo();
+            BeanUtil.copyProperties(record,accountMultilevelVo);
+            Integer id = record.getId();
+
+
+            List<AccountGroup> accountGroups = pcAccountGroupMapper.selectList(new QueryWrapper<AccountGroup>().eq("account_id", id));
+            List<Integer> pcGroupId = accountGroups.stream().map(AccountGroup::getGroupId).collect(Collectors.toList());
+            accountMultilevelVo.setPcGroupId(pcGroupId);
+
+            List<Integer> appGroupId = appAccountGroupMapper.selectList(new QueryWrapper<AppSysAccountGroup>().eq("account_id", id))
+                    .stream().map(AppSysAccountGroup::getGroupId).collect(Collectors.toList());
+            accountMultilevelVo.setAppGroupId(appGroupId);
+
+            List<Integer> screenGroupId = screenAccountGroupMapper.selectList(new QueryWrapper<ScreenSysAccountGroup>().eq("account_id", id))
+                    .stream().map(ScreenSysAccountGroup::getGroupId).collect(Collectors.toList());
+            accountMultilevelVo.setScreenGroupId(screenGroupId);
+
+            list.add(accountMultilevelVo);
+        }
+
+        IPage<SysAccountMultilevelVo>  endPage = new Page<SysAccountMultilevelVo>();
+        endPage.setRecords(list);
+        endPage.setSize(page.getSize());
+        endPage.setTotal(page.getTotal());
+        endPage.setPages(page.getPages());
+        endPage.setCurrent(page.getCurrent());
+
+        return new Result(ResultCode.SUCCESS,endPage);
     }
 
     @Override
@@ -120,4 +171,84 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return new Result(ResultCode.SUCCESS,lastFarmId);
     }
 
+    @Autowired
+    IAppAuthorizeService iAppAuthorizeService;
+
+
+    @Autowired
+    IAuthorizeService iAuthorizeService;
+
+    @Autowired
+    IScreenAuthorizeService iScreenAuthorizeService;
+
+
+
+    @Override
+    @Transactional
+    public Result addApp(SysAccountMultilevelDto sysAccountMultilevel, Integer userId) {
+        int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
+        if (account > 0 ){
+            return new Result(10001,"该账号已经存在，请重新创建",false);
+
+        }
+
+        SysAccountMultilevel byId = this.getById(userId);
+
+
+        sysAccountMultilevel.setPid(userId);
+        sysAccountMultilevel.setPids(byId.getPids()+","+userId);
+
+        SysAccountMultilevel sysAccountMultilevel1 = new SysAccountMultilevel();
+        BeanUtil.copyProperties(sysAccountMultilevel,sysAccountMultilevel1);
+
+        accountMultilevelMapper.insert(sysAccountMultilevel1);
+        Integer accountId = sysAccountMultilevel1.getId();
+
+        //后台
+        List<Integer> pcGroupId = sysAccountMultilevel.getPcGroupId();
+        String collect = pcGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iAuthorizeService.saveAccountGroupNew(accountId,collect);
+
+
+        //app
+        List<Integer> appGroupId = sysAccountMultilevel.getAppGroupId();
+        String collect1 = appGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iAppAuthorizeService.saveAccountGroupNew(accountId,collect1);
+
+        //大屏
+        List<Integer> screenGroupId = sysAccountMultilevel.getScreenGroupId();
+        String collect2 = screenGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iScreenAuthorizeService.saveAccountGroupNew(accountId,collect2);
+
+        return  new Result( 10000,"添加成功",true);
+    }
+
+    @Transactional
+    @Override
+    public void updateApp(SysAccountMultilevelDto sysAccountMultilevel) {
+        //修改账号表
+        SysAccountMultilevel sysAccountMultilevel1 = new SysAccountMultilevel();
+        BeanUtil.copyProperties(sysAccountMultilevel,sysAccountMultilevel1);
+        this.updateById(sysAccountMultilevel1);
+        Integer accountId = sysAccountMultilevel.getId();
+
+        //后台
+        List<Integer> pcGroupId = sysAccountMultilevel.getPcGroupId();
+        String collect = pcGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iAuthorizeService.saveAccountGroupNew(accountId,collect);
+
+
+
+        //app
+        List<Integer> appGroupId = sysAccountMultilevel.getAppGroupId();
+        String collect1 = appGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iAppAuthorizeService.saveAccountGroupNew(accountId,collect1);
+
+
+        //大屏
+        List<Integer> screenGroupId = sysAccountMultilevel.getScreenGroupId();
+        String collect2 = screenGroupId.stream().map(String::valueOf).collect(Collectors.joining(","));
+        iScreenAuthorizeService.saveAccountGroupNew(accountId,collect2);
+    }
+
 }

huimv-farm-admin/src/main/resources/application-demo.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8090
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-farm-center-demo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: none
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

huimv-farm-admin/src/main/resources/application-dev.yml

@@ -5,13 +5,13 @@ spring:
     name: pigfarm-local-device
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
   redis:
     host: 122.112.224.199
@@ -31,4 +31,6 @@ spring:
   # 线程池 - 最大线程数 20
   #pool-max: 30
   # 线程队列容量 10
-  #pool-queue-init: 10
+  #pool-queue-init: 10
+mybatis-plus:
+  mapper-locations: classpath:com/huimv/admin/system/mapper/*.xml

huimv-farm-admin/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
   redis:
     host: 122.112.224.199

huimv-farm-admin/src/main/resources/application-prod2.yml

@@ -11,7 +11,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
   redis:
     host: 122.112.224.199
@@ -31,4 +31,7 @@ spring:
   # 线程池 - 最大线程数 20
   #pool-max: 30
   # 线程队列容量 10
-  #pool-queue-init: 10
+  #pool-queue-init: 10
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

huimv-farm-admin/src/main/resources/application-yv.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8090
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: none
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

huimv-farm-admin/src/main/resources/application.properties

@@ -1,6 +1,8 @@
 #spring.profiles.active=dev
-spring.profiles.active=prod3
-#spring.profiles.active=prod2
+#spring.profiles.active=prod3
+spring.profiles.active=prod
+#spring.profiles.active=demo
+#spring.profiles.active=yv
 
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/AccountGroupMapper.xml

@@ -4,6 +4,6 @@
 
 
     <delete id="removeAccountGroup">
-        DELETE FROM sys_account_group WHERE group_id=#{groupIds}
+        DELETE FROM sys_account_group WHERE  account_id = #{accountId}
     </delete>
 </mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/AppAccountGroupMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.AppAccountGroupMapper">
+
+
+    <delete id="removeAccountGroup">
+        DELETE FROM app_sys_account_group WHERE group_id=#{groupIds}
+    </delete>
+</mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/AppGroupMenuMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.AppGroupMenuMapper">
+
+
+
+    <delete id="removeGroupMenu">
+        DELETE FROM app_sys_group_menu WHERE group_id=#{groupId}
+    </delete>
+</mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/AppMenuMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.AppMenuMapper">
+
+
+    <select id="getMyMenuApp" resultType="com.huimv.admin.system.entity.AppSysMenu">
+        SELECT * FROM app_sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM app_sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM app_sys_account_group WHERE
+        account_id=#{accountName} ))
+        ORDER BY sort ASC
+    </select>
+
+
+    <select id="getMyButton" resultType="string">
+        SELECT permission FROM app_sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM app_sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM app_sys_account_group WHERE
+        account_id=#{userId})) and weight =1
+        ORDER BY sort ASC
+    </select>
+</mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/ScreenAccountGroupMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.ScreenAccountGroupMapper">
+
+
+    <delete id="removeAccountGroup">
+        DELETE FROM screen_sys_account_group WHERE group_id=#{groupIds}
+    </delete>
+</mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/ScreenGroupMenuMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.ScreenGroupMenuMapper">
+
+
+
+    <delete id="removeGroupMenu">
+        DELETE FROM screen_sys_group_menu WHERE group_id=#{groupId}
+    </delete>
+</mapper>

huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/ScreenMenuMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.system.mapper.ScreenMenuMapper">
+
+
+    <select id="getMyMenuApp" resultType="com.huimv.admin.system.entity.ScreenSysMenu">
+        SELECT * FROM screen_sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM screen_sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM screen_sys_account_group WHERE
+        account_id=#{accountName} ))
+        ORDER BY sort ASC
+    </select>
+
+
+    <select id="getMyButton" resultType="string">
+        SELECT permission FROM screen_sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM screen_sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM screen_sys_account_group WHERE
+        account_id=#{userId})) and weight =1
+        ORDER BY sort ASC
+    </select>
+</mapper>

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/BaseBoxController.java

@@ -1,6 +1,7 @@
 package com.huimv.environ.eco.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -12,6 +13,8 @@ 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;
+
 /**
  * <p>
  *  前端控制器
@@ -40,5 +43,16 @@ public class BaseBoxController {
 
         return new Result(ResultCode.SUCCESS, baseBoxService.list(new QueryWrapper<BaseBox>().eq("floor_id",floorId)));
     }
+    @GetMapping("listByFloorDemo")
+    public Result listByFloorDemo(@RequestParam(name = "floorId") Integer floorId){
+        List<BaseBox> floor_id = baseBoxService.list(new QueryWrapper<BaseBox>().eq("floor_id", floorId));
+        if (ObjectUtil.isNotEmpty(floor_id)){
+            for (BaseBox baseBox : floor_id) {
+                baseBox.setAlias(baseBox.getAlias().substring(4));
+            }
+        }
+        return new Result(ResultCode.SUCCESS, floor_id);
+    }
+
 
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/BaseFloorController.java

@@ -1,6 +1,7 @@
 package com.huimv.environ.eco.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -12,6 +13,8 @@ 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;
+
 /**
  * <p>
  *  前端控制器
@@ -28,8 +31,21 @@ public class BaseFloorController {
     private IBaseFloorService baseFloorService;
 
     @GetMapping("list")
-    public Result list(@RequestParam(name = "farmId") Integer farmId){
-        return new Result(ResultCode.SUCCESS,baseFloorService.list(new QueryWrapper<BaseFloor>().eq("farm_id",farmId)));
+    public Result list(@RequestParam(name = "farmId") Integer farmId) {
+        return new Result(ResultCode.SUCCESS, baseFloorService.list(new QueryWrapper<BaseFloor>().eq("farm_id", farmId)));
+    }
+
+    @GetMapping("listDemo")
+    public Result listDemo(@RequestParam(name = "farmId") Integer farmId) {
+        List<BaseFloor> baseFloors = baseFloorService.list(new QueryWrapper<BaseFloor>().eq("farm_id", farmId));
+        if (ObjectUtil.isNotEmpty(baseFloors)) {
+            for (BaseFloor baseFloor : baseFloors) {
+                baseFloor.setFloorName(baseFloor.getFloorName().substring(2));
+
+            }
+        }
+
+        return new Result(ResultCode.SUCCESS, baseFloors);
     }
 
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseRoomServiceImpl.java

@@ -56,7 +56,6 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     @Override
     public Result getAllRoomEnvironment(Integer farmId) {
         baseRoomMapper.setS();
-
         List<AllRoomEnvironment> list =  baseRoomMapper.getAllRoomEnvironment(farmId);
 
         return new Result(ResultCode.SUCCESS,list);
@@ -77,7 +76,6 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
             if (ObjectUtil.isNotEmpty(baseRoom)){
                 roomId = baseRoom.getId()+"";
             }
-//            roomId ="157";
 
         }
         baseRoom =this.getById(roomId);
@@ -89,8 +87,8 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         QueryWrapper<SysTemperature> temperatureWrapper = new QueryWrapper<>();
         humidityWrapper.eq("room_id",roomId);
         temperatureWrapper.eq("room_id",roomId);
-
-
+        humidityWrapper.between("value",0,100);
+        temperatureWrapper.between("value", -50,50);
 
         List<SysHumidity> humidities;
         List<SysTemperature> semperatures;
@@ -111,7 +109,9 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         else if ("3".equals(type)){
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             humidityWrapper.ge("create_time",timesMonthmorning );
+
             temperatureWrapper.ge("create_time", timesMonthmorning);
+
             humidities =   humidityMapper.listDay(humidityWrapper);
             semperatures =   temperatureMapper.listDay(temperatureWrapper);
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/SysFodderServiceImpl.java

@@ -112,17 +112,17 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
             endMap.put("fodderList",sysFodders);
             endMap.put("value",countAllValue);
         }
-        //本周
-        else if ("1".equals(type+"")){
-            wrapper.ge("create_time", DateUtil.beginOfWeek(new Date()));
+        //本月
+        else if ("2".equals(type+"")){
+            wrapper.ge("create_time", DateUtil.beginOfMonth(new Date()));
             List<SysFodder> sysFodders = fodderMapper.countDayValue(wrapper);
             Integer countAllValue = fodderMapper.countAllValue(wrapper);
             endMap.put("fodderList",sysFodders);
             endMap.put("value",countAllValue);
         }
-        //本月
+        //本周
         else {
-            wrapper.ge("create_time", DataUill.getTimesMonthmorning());
+            wrapper.ge("create_time", DateUtil.beginOfWeek(new Date()));
             List<SysFodder> sysFodders = fodderMapper.countDayValue(wrapper);
             Integer countAllValue = fodderMapper.countAllValue(wrapper);
             endMap.put("fodderList",sysFodders);
@@ -141,11 +141,13 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
 
 
         QueryWrapper<SysFodder> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",farmId);
 
-        wrapper.ge("create_time", DataUill.getTimesmorning());
         List list = new ArrayList();
         for (BaseFloor baseFloor : baseFloors) {
+            wrapper.clear();
+            wrapper.eq("farm_id",farmId);
+
+            wrapper.ge("create_time", DataUill.getTimesmorning());
             Map endMap = new HashMap();
             wrapper.eq("floor_id",baseFloor.getId());
             Integer value = fodderMapper.countAllValue(wrapper);

huimv-farm-environ/src/main/resources/application-demo.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8092
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-farm-center-demo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: none
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

huimv-farm-environ/src/main/resources/application-dev.yml

@@ -6,16 +6,16 @@ spring:
     name: huimv-farm-environ
   datasource:
     #本地测试数据库
-    url: jdbc:mysql://192.168.1.7/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     show-sql: true
-#  redis:
-#    host: 122.112.224.199
-#    port: 6379
-#    password: hm123456
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456

huimv-farm-environ/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
   redis:
     host: 122.112.224.199
@@ -31,4 +31,7 @@ spring:
   # 线程池 - 最大线程数 20
   #pool-max: 30
   # 线程队列容量 10
-  #pool-queue-init: 10
+  #pool-queue-init: 10
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

huimv-farm-environ/src/main/resources/application.properties

@@ -1,4 +1,6 @@
 #spring.profiles.active=dev
-spring.profiles.active=prod3
+#spring.profiles.active=prod3
+#spring.profiles.active=demo
+spring.profiles.active=prod
 #spring.profiles.active=prod2
 

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/BaseRoomMapper.xml

@@ -4,20 +4,21 @@
     <update id="setS">
 
         SET sql_mode =
-"STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
+      "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
     </update>
 
 
     <select id="getAllRoomEnvironment" resultType="com.huimv.environ.eco.entity.dto.AllRoomEnvironment">
 
-
-        SELECT CONCAT(br.alias ,br.room_name) room,br.id room_id  , IFNULL(tem.value,0) temperature, IFNULL(hum.value,0) humidity
+  SELECT CONCAT(br.alias ,br.room_name) room,br.id room_id  , tem.value temperature, hum.value humidity
         FROM
         `base_room` br
         LEFT JOIN  (
           SELECT  a.tem_id ,a.room_id , a.value `value` FROM  `sys_temperature`  a RIGHT  JOIN
                 (
-                SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature` WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature`
+                WHERE  TO_DAYS(create_time) = TO_DAYS(NOW()) AND `value` &lt;= 50 AND `value` &gt;= -50
+                 GROUP BY room_id
                 ) b
                 ON  a.tem_id=  b.tem_id
 
@@ -27,16 +28,19 @@
          LEFT JOIN  (
           SELECT  a.hum_id ,a.room_id , a.value `value` FROM  `sys_humidity`  a RIGHT  JOIN
                 (
-                SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`  WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`
+                 WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 100 AND`value` &gt;= 0
+                 GROUP BY room_id
                 ) b
                 ON  a.hum_id=  b.hum_id
 
          )  hum ON  hum.room_id = br.id  WHERE br.farm_id =#{farmId}
 
 
+
     </select>
     <select id="getAllDayWater" resultType="com.huimv.environ.eco.entity.dto.AllDayWater">
-        SELECT CONCAT(br.alias ,br.room_name) room,  ROUND (IFNULL(water.`value` ,0),2) water
+        SELECT CONCAT(br.alias ,br.room_name) room,  ROUND (water.`value`,2) water
         FROM `base_room` br
          LEFT JOIN (
             SELECT SUM(increase_value)`value` ,room_id  FROM `sys_month_water`  WHERE TO_DAYS(create_time) = TO_DAYS(NOW()) GROUP BY room_id
@@ -44,13 +48,15 @@
          WHERE br.farm_id = #{farmId}
     </select>
     <select id="listAllWaterEnvPowerApp" resultType="com.huimv.environ.eco.entity.dto.AllWaterEnvPowerApp">
-        SELECT CONCAT(br.alias ,br.room_name) room_name,br.id room_id ,  ROUND(IFNULL(tem.value,0) ,2)tem,  ROUND( IFNULL(hum.value,0) ,2)hum , ROUND(IFNULL(water.`value` ,0),2) water,bf.id floor_id ,br.box_id box_id
+        SELECT CONCAT(br.alias ,br.room_name) room_name,br.id room_id ,  ROUND(tem.value ,2)tem,  ROUND(hum.value,2)hum , ROUND(water.`value` ,2) water,bf.id floor_id ,br.box_id box_id
         FROM
         `base_room` br
         LEFT JOIN  (
           SELECT  a.tem_id ,a.room_id , a.value `value` FROM  `sys_temperature`  a RIGHT  JOIN
                 (
-                SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature` WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature`
+                WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 50 AND`value` &gt;= -50
+                 GROUP BY room_id
                 ) b
                 ON  a.tem_id=  b.tem_id
 
@@ -60,7 +66,9 @@
          LEFT JOIN  (
           SELECT  a.hum_id ,a.room_id , a.value `value` FROM  `sys_humidity`  a RIGHT  JOIN
                 (
-                SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`  WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`
+                 WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 100 AND`value` &gt;= 0
+                  GROUP BY room_id
                 ) b
                 ON  a.hum_id=  b.hum_id
 
@@ -68,7 +76,7 @@
 
 
          LEFT JOIN (
-            SELECT SUM(increase_value)`value` ,room_id  FROM `sys_month_water`  GROUP BY room_id
+            SELECT SUM(increase_value)`value` ,room_id  FROM `sys_month_water`  WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
          )water ON water.room_id = br.id
 
             LEFT JOIN `base_box` bb  ON bb.uid = br.box_id

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/SysDayWaterMapper.xml

@@ -20,7 +20,7 @@
     </select>
     <select id="listDay" resultType="com.huimv.environ.eco.entity.SysDayWater">
 
-          SELECT id, ROUND(SUM(`increase_value`),2) 'value' ,create_time ,room_id,farm_id FROM `sys_month_water`
+          SELECT id, IFNULL(ROUND(SUM(`increase_value`),2),0) 'value' ,create_time ,room_id,farm_id FROM `sys_month_water`
         ${ew.customSqlSegment}
 
        GROUP BY DATE_FORMAT( `create_time`, '%m%d' )

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/SysFodderMapper.xml

@@ -26,19 +26,19 @@
     </select>
     <select id="countAllValue" resultType="java.lang.Integer">
         SELECT
-            SUM(`value`)
+            IFNULL(SUM(`value`),0)
         FROM `sys_fodder`
         ${ew.customSqlSegment}
 
     </select>
     <select id="fodderMapper" resultType="com.huimv.environ.eco.entity.dto.ScreenDto">
       SELECT
- (SELECT MIN(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId} )minHum ,
- (SELECT MAX(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  )maxHum,
-(SELECT MAX(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId} )maxTem,
- (SELECT MIN(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId} )minTem,
- (SELECT ROUND(SUM(`increase_value`),2) FROM`sys_month_water` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  ) dayWater,
- (SELECT ROUND(SUM(`increase_value`),2) FROM `sys_month_water` WHERE DATE_FORMAT( `create_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )  AND farm_id  = #{farmId}   ) monthWater
+         (SELECT MIN(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId} AND `value` &gt;= 0  )minHum ,
+         (SELECT MAX(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  AND `value` &lt;= 100  )maxHum,
+        (SELECT MAX(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId} AND `value` &lt;= 50 )maxTem,
+         (SELECT MIN(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId}  AND `value` &gt;= -50 )minTem,
+         (SELECT ROUND(SUM(`increase_value`),2) FROM`sys_month_water` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  ) dayWater,
+         (SELECT ROUND(SUM(`increase_value`),2) FROM `sys_month_water` WHERE DATE_FORMAT( `create_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )  AND farm_id  = #{farmId}   ) monthWater
     </select>
 
 

huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/ProdProduceController.java

@@ -33,6 +33,8 @@ public class ProdProduceController {
     private IProdProduceService prodProduceService;
     private String[] fullDataType = new String[]{"avg_farrow_1", "avg_farrow_2", "avg_farrow_3", "avg_weight", "break_grice", "break_rate", "breed_rate",
             "fatpig_rate", "grice_rate", "nest_times", "piglet_rate", "psy"};
+    private String[] fullDataType1 = new String[]{"平均窝产仔猪", "平均窝产活仔数", "平均窝产正常仔数", "平均窝断奶重", "窝断奶仔猪数", "7日断配率", "配种分娩率",
+            "肥猪成活率", "产房成活率", "年产窝数", "保育成活率", "PSY"};
 
     @GetMapping("/listProducee")
     public Result listProducee(@RequestParam(name = "farmId") Integer farmId) {
@@ -62,7 +64,8 @@ public class ProdProduceController {
             if (!isExist) {
                 JSONObject newJo = new JSONObject();
                 newJo.put("stockQuantity","0");
-                newJo.put("stockType","'"+fullDataType[a]+"'");
+                newJo.put("stockType",fullDataType[a]);
+                newJo.put("stockName",fullDataType1[a]);
                 map.put(fullDataType[a],newJo);
             }
         }

huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/WeightInformationController.java

@@ -0,0 +1,45 @@
+package com.huimv.produce.produce.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.service.IWeightInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-03-30
+ */
+@RestController
+@RequestMapping("/weightInformation")
+public class WeightInformationController {
+
+    @Autowired
+    private IWeightInformationService weightInformationService;
+
+
+    @PostMapping("/pageWeight")
+    public Result pageWeight(@RequestBody Map<String,String> map){
+
+        return weightInformationService.pageWeight(map);
+
+    }
+
+    @PostMapping("/dayWeight")
+    public Result dayWeight(@RequestBody Map<String,String> map){
+
+        return weightInformationService.dayWeight(map);
+
+    }
+
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/entity/WeightInformation.java

@@ -0,0 +1,361 @@
+package com.huimv.produce.produce.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Column;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("weight_information")
+public class WeightInformation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 流水单号
+     */
+    private String serialNumber;
+
+    /**
+     * 站点编号
+     */
+    private String stationid;
+
+    /**
+     * 站点名称
+     */
+    private String stationname;
+
+    /**
+     * 车号
+     */
+    private String carNumber;
+
+    /**
+     * 车架号
+     */
+    private String vinNumber;
+
+    /**
+     * 称重类型
+     */
+    private String poundType;
+
+    /**
+     * 发货单位
+     */
+    private String consigner;
+
+    /**
+     * 收货单位
+     */
+    private String consignee;
+
+    /**
+     * 货物名称
+     */
+    private String variety;
+
+    /**
+     * 规格
+     */
+    private String specification;
+
+    /**
+     * 毛重
+     */
+    private Integer grossWeight;
+
+    /**
+     * 实际皮重
+     */
+    private Integer tareWeight;
+
+    /**
+     * 实际净重
+     */
+    private Integer netWeight;
+
+    /**
+     * 扣重
+     */
+    private Integer deductionWeight;
+
+    /**
+     * 实重
+     */
+    private Integer actualWeight;
+
+    /**
+     * 单价
+     */
+    private Integer price;
+
+    /**
+     * 金额
+     */
+    private Integer money;
+
+    /**
+     * 折方系数
+     */
+    private Integer coefficient;
+
+    /**
+     * 方量
+     */
+    private Integer capacity;
+
+    /**
+     * 称重费用
+     */
+    private Integer weighingCharges;
+
+    /**
+     * 毛重司磅员
+     */
+    private String grossWeighman;
+
+    /**
+     * 皮重司磅员
+     */
+    private String tareWeighman;
+
+    /**
+     * 过毛重地磅号
+     */
+    private String grossPoundNumber;
+
+    /**
+     * 过皮重地磅号
+     */
+    private String tarePoundNumber;
+
+    /**
+     * 毛重称重时间
+     */
+    private String grossWeightTime;
+
+    /**
+     * 皮重称重时间
+     */
+    private String tareWeightTime;
+
+    /**
+     * 第一次称重时间
+     */
+    private String firstWeighingTime;
+
+    /**
+     * 第二次称重时间
+     */
+    private String secondWeighingTime;
+
+    /**
+     * 称重时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date weighingTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 打印
+     */
+    private Integer timesOfPrints;
+
+    /**
+     * 上传治超
+     */
+    private Boolean isUpload;
+
+    /**
+     * 上传治超
+     */
+    private Boolean isUpload2;
+
+    /**
+     * 上传治超
+     */
+    private Boolean isUpload3;
+
+    /**
+     * 上传科达
+     */
+    private Boolean isUploadCloud;
+
+    /**
+     * 状态
+     */
+    private String dataStatus;
+
+    /**
+     * 车牌颜色
+     */
+    private String memo1;
+
+    /**
+     * 轮轴数
+     */
+    private String memo2;
+
+    /**
+     * 限重
+     */
+    private String memo3;
+
+    /**
+     * 超重
+     */
+    private String memo4;
+
+    /**
+     * 超重比例
+     */
+    private String memo5;
+
+    /**
+     * 允许超重比例
+     */
+    private String memo6;
+
+    /**
+     * 劝返流水单号
+     */
+    private String memo7;
+
+    /**
+     * 劝返卸重
+     */
+    private String memo8;
+
+    /**
+     * 已卸重
+     */
+    private String memo9;
+
+    /**
+     * 劝返时间
+     */
+    private String memo10;
+
+    /**
+     * memo11
+     */
+    private String memo11;
+
+    /**
+     * memo12
+     */
+    private String memo12;
+
+    /**
+     * memo13
+     */
+    private String memo13;
+
+    /**
+     * memo14
+     */
+    private String memo14;
+
+    /**
+     * memo15
+     */
+    private String memo15;
+
+    /**
+     * memo16
+     */
+    private String memo16;
+
+    /**
+     * memo17
+     */
+    private String memo17;
+
+    /**
+     * memo18
+     */
+    private String memo18;
+
+    /**
+     * memo19
+     */
+    private String memo19;
+
+    /**
+     * memo20
+     */
+    private String memo20;
+
+    /**
+     * memo21
+     */
+    private String memo21;
+
+    /**
+     * 过磅类型
+     */
+    private String weighingType;
+
+    /**
+     * 数据上传状态
+     */
+    @TableField(value = "uploadKdState")
+    private Integer uploadKdState;
+
+    /**
+     * 图片上传状态
+     */
+    @TableField(value = "uploadKdState2")
+    private Integer uploadKdState2;
+
+    /**
+     * 视频上传状态
+     */
+    @TableField(value = "uploadKdState3")
+    private Integer uploadKdState3;
+
+    /**
+     * 上传时间
+     */
+    private String uploadTime;
+
+
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/entity/dto/WeightInformationVo.java

@@ -0,0 +1,10 @@
+package com.huimv.produce.produce.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class WeightInformationVo {
+    private String days;
+    private Integer counts;
+    private Integer weight;
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/mapper/WeightInformationMapper.java

@@ -0,0 +1,23 @@
+package com.huimv.produce.produce.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.produce.produce.entity.WeightInformation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.produce.produce.entity.dto.WeightInformationVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-03-30
+ */
+public interface WeightInformationMapper extends BaseMapper<WeightInformation> {
+
+    List<WeightInformationVo> dayWeight(@Param(Constants.WRAPPER)QueryWrapper<WeightInformation> wrapper);
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/IWeightInformationService.java

@@ -0,0 +1,22 @@
+package com.huimv.produce.produce.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.entity.WeightInformation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-03-30
+ */
+public interface IWeightInformationService extends IService<WeightInformation> {
+
+    Result pageWeight(Map<String,String> map);
+
+    Result dayWeight(Map<String, String> map);
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdSalesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.produce.produce.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.*;
@@ -91,20 +92,53 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
         ProdSalesDto prodSalesDto = salesMapper.countMonth(wrapper);
 
 
+        wrapper.clear();
+        wrapper.ge("add_date",DateUtil.beginOfMonth(new Date()));
+        wrapper.orderByDesc("add_date");
+        wrapper.eq("farm_id",farmId);
+        wrapper.last("limit 1");
+        ProdSales one = this.getOne(wrapper);
+        if (ObjectUtil.isNotEmpty(one)){
+            //本月
+            endMap.put("nowMoney", one.getMonthMoney());
+            endMap.put("nowQuantity", one.getMonthQuantity());
+
+            endMap.put("timeList",timeList);
+            endMap.put("moneyList",moneyList);
+            endMap.put("quantityList",quantityList);
+            endMap.put("moneyList1",moneyList1);
+        }else {
+            endMap.put("nowMoney", null);
+            endMap.put("nowQuantity", null);
+
+            endMap.put("timeList",null);
+            endMap.put("moneyList",null);
+            endMap.put("quantityList",null);
+            endMap.put("moneyList1",null);
+        }
 
 
-        endMap.put("nowMoney", prodSalesDto.getMoney());
-        endMap.put("nowQuantity", prodSalesDto.getQuantity());
+        //上月
 
-        endMap.put("timeList",timeList);
-        endMap.put("moneyList",moneyList);
-        endMap.put("quantityList",quantityList);
-        endMap.put("moneyList1",moneyList1);
 
-        endMap.put("quantity",lastProdSales.getQuantity());
-        endMap.put("quantityPercent", PercentUtil.getGrowth(lastProdSales.getQuantity(),lastTwoProdSales.getQuantity()));
-        endMap.put("money", NumberUtils.format(lastProdSales.getMoney()+""));
-        endMap.put("moneyPercent", PercentUtil.getGrowth(lastProdSales.getMoney(),lastTwoProdSales.getMoney()));
+        wrapper.clear();
+        wrapper.lt("add_date",DateUtil.beginOfMonth(new Date()));
+        wrapper.orderByDesc("add_date");
+        wrapper.eq("farm_id",farmId);
+        wrapper.last("limit 1");
+        ProdSales lastone = this.getOne(wrapper);
+        if (ObjectUtil.isNotEmpty(lastone)){
+            endMap.put("quantity",lastone.getMonthQuantity());
+            endMap.put("quantityPercent", PercentUtil.getGrowth(lastProdSales.getQuantity(),lastTwoProdSales.getQuantity()));
+            endMap.put("money", NumberUtils.format(lastone.getMonthMoney()+""));
+            endMap.put("moneyPercent", PercentUtil.getGrowth(lastProdSales.getMoney(),lastTwoProdSales.getMoney()));
+        }else {
+            endMap.put("quantity",null);
+            endMap.put("quantityPercent", null);
+            endMap.put("money", null);
+            endMap.put("moneyPercent", null);
+        }
+
 
 
         return new Result(ResultCode.SUCCESS,endMap);

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdStockServiceImpl.java

@@ -69,13 +69,17 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         List<ProdStock> prodStockList = this.list(wrapper);
 
         Set month = new HashSet();
+        List month1 = new ArrayList();
         List sowStock = new ArrayList();
         List boarStock = new ArrayList();
         List griceStock = new ArrayList();
         List pigletStock = new ArrayList();
         List fatpigStock = new ArrayList();
         for (ProdStock prodStock : prodStockList) {
-            month.add(prodStock.getMonth());
+            if ( month.add(prodStock.getMonth())){
+                month1.add(prodStock.getMonth());
+            }
+
             String stockType = prodStock.getStockType();
             Integer stockQuantity = prodStock.getStockQuantity();
             switch (stockType){
@@ -105,7 +109,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         map.put("griceStock",griceStock);
         map.put("pigletStock",pigletStock);
         map.put("fatpigStock",fatpigStock);
-        map.put("month",month);
+        map.put("month",month1);
         return map;
     }
 

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/WeightInformationServiceImpl.java

@@ -0,0 +1,83 @@
+package com.huimv.produce.produce.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.produce.entity.WeightInformation;
+import com.huimv.produce.produce.entity.dto.WeightInformationVo;
+import com.huimv.produce.produce.mapper.WeightInformationMapper;
+import com.huimv.produce.produce.service.IWeightInformationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-03-30
+ */
+@Service
+public class WeightInformationServiceImpl extends ServiceImpl<WeightInformationMapper, WeightInformation> implements IWeightInformationService {
+
+
+    @Autowired
+    private WeightInformationMapper weightInformationMapper;
+
+    @Override
+    public Result pageWeight(Map<String,String> map) {
+        String pageSize = map.get("pageSize");
+        String current = map.get("current");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        String variety = map.get("variety");
+        String stationName = map.get("stationName");
+
+
+        if (StringUtils.isBlank(pageSize)){
+            pageSize = "10";
+        }
+        if (StringUtils.isBlank(current)){
+            current = "1";
+        }
+        QueryWrapper<WeightInformation> wrapper = new QueryWrapper<>();
+
+        wrapper.ge(StringUtils.isNotBlank(startDate),"weighing_time",startDate);
+        wrapper.le(StringUtils.isNotBlank(endDate),"weighing_time",endDate);
+
+        wrapper.eq(StringUtils.isNotBlank(variety),"variety",variety);
+        wrapper.eq(StringUtils.isNotBlank(stationName),"stationname",stationName);
+
+        Page<WeightInformation> page = this.page(new Page<WeightInformation>(Long.parseLong(current), Long.parseLong(pageSize)), wrapper);
+
+
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result dayWeight(Map<String, String> map) {
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        String variety = map.get("variety");
+        String stationName = map.get("stationName");
+
+
+        QueryWrapper<WeightInformation> wrapper = new QueryWrapper<>();
+        wrapper.ge(StringUtils.isNotBlank(startDate),"weighing_time",startDate);
+        wrapper.le(StringUtils.isNotBlank(endDate),"weighing_time",endDate);
+        wrapper.eq(StringUtils.isNotBlank(variety),"variety",variety);
+        wrapper.eq(StringUtils.isNotBlank(stationName),"stationname",stationName);
+
+
+        List<WeightInformationVo> list = weightInformationMapper.dayWeight(wrapper);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+}

huimv-farm-produce/src/main/java/com/huimv/produce/warning/controller/BaseWarningInfoController.java

@@ -40,6 +40,10 @@ public class BaseWarningInfoController {
     public Result listWarningInfo(@RequestBody Map<String, String> map ) {
         return warningInfoService.listWarningInfo(map);
     }
+    @PostMapping("/listWarningInfoScreen")
+    public Result listWarningInfoScreen(@RequestBody Map<String, String> map ) {
+        return warningInfoService.listWarningInfoScreen(map);
+    }
 
 
 }