基础信息

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/admin/entity/Menu.java

@@ -41,6 +41,8 @@ public class Menu extends Model {
 
     private String permission;
 
+    private Boolean ifShow;
+
 
 
 //    private List<Menu> children;

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/admin/service/impl/MenuServiceImpl.java

@@ -131,6 +131,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
                 map.put("pid", menuEntity.getParentId());
                 map.put("permission", menuEntity.getPermission());
                 map.put("weight", menuEntity.getWeight());
+                map.put("ifShow", menuEntity.getIfShow());
                 if (menuEntityIsChildren(menuEntity,menuEntityList) ){
                     map.put("children",optimizeListUtil(menuEntity.getId(),menuEntityList));
                 }else {

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BasePigpenController.java

@@ -42,16 +42,19 @@ public class BasePigpenController {
     public Result add(@RequestBody BasePigpen basePigpen, HttpServletRequest request){
 
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        Integer farmId = basePigpen.getFarmId();
 
         basePigpen.setCreatTime(new Date());
         basePigpen.setCreatUser(userId);
-        basePigpen.setFarmCode(basePigpen.getFarmId()+"");   //farm_id
+        basePigpen.setFarmCode(farmId+"");
+
+        BaseFarmInfo byId = baseFarmInfoService.getById(farmId);
+
+        basePigpen.setType(byId.getType());
         basePigpenService.save(basePigpen);
         return new Result(10000,"添加成功",true);
     }
 
-
-
     @PostMapping("/update")
     public Result update(@RequestBody BasePigpen basePigpen){
 

huimv-goldpig/huimv-goldpig-eartag/src/main/resources/application-dev.yml

@@ -58,8 +58,8 @@ spring:
 #      ddl-auto: update
 #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    open-in-view: true
-#
-#      redis:
+
+    #  redis:
 #    database: 0
 #    host: 119.3.84.55
 #    port: 6379