浏览代码

智慧农场谷歌版本

wang_xy 3 年之前
父节点
当前提交
2fd4bc8994
共有 100 个文件被更改,包括 11966 次插入0 次删除
  1. 109 0
      mybusiness/pom.xml
  2. 107 0
      mybusiness/src/main/java/com/business/domain/SysFileInfo.java
  3. 16 0
      mybusiness/src/main/java/com/business/tools/BasepathUtil.java
  4. 44 0
      mybusiness/src/main/java/com/business/tools/UUID_Tools.java
  5. 37 0
      mybusiness/src/main/java/com/business/zhnc/bigData/controller/BigDataController.java
  6. 127 0
      mybusiness/src/main/java/com/business/zhnc/cattleFarm/controller/SyglCattleFarmController.java
  7. 155 0
      mybusiness/src/main/java/com/business/zhnc/cattleFarm/domain/SyglCattleFarm.java
  8. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleFarm/mapper/SyglCattleFarmMapper.java
  9. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleFarm/service/ISyglCattleFarmService.java
  10. 101 0
      mybusiness/src/main/java/com/business/zhnc/cattleFarm/service/impl/SyglCattleFarmServiceImpl.java
  11. 133 0
      mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/controller/SyglCattleGrowRecordController.java
  12. 98 0
      mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/domain/SyglCattleGrowRecord.java
  13. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/mapper/SyglCattleGrowRecordMapper.java
  14. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/service/ISyglCattleGrowRecordService.java
  15. 102 0
      mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/service/impl/SyglCattleGrowRecordServiceImpl.java
  16. 126 0
      mybusiness/src/main/java/com/business/zhnc/cattleInfo/controller/SyglCattleInfoController.java
  17. 280 0
      mybusiness/src/main/java/com/business/zhnc/cattleInfo/domain/SyglCattleInfo.java
  18. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleInfo/mapper/SyglCattleInfoMapper.java
  19. 61 0
      mybusiness/src/main/java/com/business/zhnc/cattleInfo/service/ISyglCattleInfoService.java
  20. 109 0
      mybusiness/src/main/java/com/business/zhnc/cattleInfo/service/impl/SyglCattleInfoServiceImpl.java
  21. 134 0
      mybusiness/src/main/java/com/business/zhnc/cowshedInfo/controller/SyglCowshedInfoController.java
  22. 111 0
      mybusiness/src/main/java/com/business/zhnc/cowshedInfo/domain/SyglCowshedInfo.java
  23. 61 0
      mybusiness/src/main/java/com/business/zhnc/cowshedInfo/mapper/SyglCowshedInfoMapper.java
  24. 61 0
      mybusiness/src/main/java/com/business/zhnc/cowshedInfo/service/ISyglCowshedInfoService.java
  25. 101 0
      mybusiness/src/main/java/com/business/zhnc/cowshedInfo/service/impl/SyglCowshedInfoServiceImpl.java
  26. 126 0
      mybusiness/src/main/java/com/business/zhnc/diseaseArchives/controller/SyglDiseaseArchivesController.java
  27. 141 0
      mybusiness/src/main/java/com/business/zhnc/diseaseArchives/domain/SyglDiseaseArchives.java
  28. 61 0
      mybusiness/src/main/java/com/business/zhnc/diseaseArchives/mapper/SyglDiseaseArchivesMapper.java
  29. 61 0
      mybusiness/src/main/java/com/business/zhnc/diseaseArchives/service/ISyglDiseaseArchivesService.java
  30. 102 0
      mybusiness/src/main/java/com/business/zhnc/diseaseArchives/service/impl/SyglDiseaseArchivesServiceImpl.java
  31. 126 0
      mybusiness/src/main/java/com/business/zhnc/drugsArchives/controller/SyglDrugsArchivesController.java
  32. 99 0
      mybusiness/src/main/java/com/business/zhnc/drugsArchives/domain/SyglDrugsArchives.java
  33. 61 0
      mybusiness/src/main/java/com/business/zhnc/drugsArchives/mapper/SyglDrugsArchivesMapper.java
  34. 61 0
      mybusiness/src/main/java/com/business/zhnc/drugsArchives/service/ISyglDrugsArchivesService.java
  35. 101 0
      mybusiness/src/main/java/com/business/zhnc/drugsArchives/service/impl/SyglDrugsArchivesServiceImpl.java
  36. 133 0
      mybusiness/src/main/java/com/business/zhnc/fire/controller/YjglFireController.java
  37. 94 0
      mybusiness/src/main/java/com/business/zhnc/fire/domain/YjglFire.java
  38. 61 0
      mybusiness/src/main/java/com/business/zhnc/fire/mapper/YjglFireMapper.java
  39. 61 0
      mybusiness/src/main/java/com/business/zhnc/fire/service/IYjglFireService.java
  40. 102 0
      mybusiness/src/main/java/com/business/zhnc/fire/service/impl/YjglFireServiceImpl.java
  41. 133 0
      mybusiness/src/main/java/com/business/zhnc/intrusion/controller/YjglIntrusionController.java
  42. 94 0
      mybusiness/src/main/java/com/business/zhnc/intrusion/domain/YjglIntrusion.java
  43. 61 0
      mybusiness/src/main/java/com/business/zhnc/intrusion/mapper/YjglIntrusionMapper.java
  44. 61 0
      mybusiness/src/main/java/com/business/zhnc/intrusion/service/IYjglIntrusionService.java
  45. 102 0
      mybusiness/src/main/java/com/business/zhnc/intrusion/service/impl/YjglIntrusionServiceImpl.java
  46. 126 0
      mybusiness/src/main/java/com/business/zhnc/machiningArchives/controller/SyglMachiningArchivesController.java
  47. 127 0
      mybusiness/src/main/java/com/business/zhnc/machiningArchives/domain/SyglMachiningArchives.java
  48. 61 0
      mybusiness/src/main/java/com/business/zhnc/machiningArchives/mapper/SyglMachiningArchivesMapper.java
  49. 61 0
      mybusiness/src/main/java/com/business/zhnc/machiningArchives/service/ISyglMachiningArchivesService.java
  50. 101 0
      mybusiness/src/main/java/com/business/zhnc/machiningArchives/service/impl/SyglMachiningArchivesServiceImpl.java
  51. 29 0
      mybusiness/src/main/java/com/business/zhnc/phone/controller/PhoneController.java
  52. 129 0
      mybusiness/src/main/java/com/business/zhnc/residentUser/controller/YyglResidentUserController.java
  53. 220 0
      mybusiness/src/main/java/com/business/zhnc/residentUser/domain/YyglResidentUser.java
  54. 61 0
      mybusiness/src/main/java/com/business/zhnc/residentUser/mapper/YyglResidentUserMapper.java
  55. 61 0
      mybusiness/src/main/java/com/business/zhnc/residentUser/service/IYyglResidentUserService.java
  56. 110 0
      mybusiness/src/main/java/com/business/zhnc/residentUser/service/impl/YyglResidentUserServiceImpl.java
  57. 126 0
      mybusiness/src/main/java/com/business/zhnc/salesArchives/controller/SyglSalesArchivesController.java
  58. 127 0
      mybusiness/src/main/java/com/business/zhnc/salesArchives/domain/SyglSalesArchives.java
  59. 61 0
      mybusiness/src/main/java/com/business/zhnc/salesArchives/mapper/SyglSalesArchivesMapper.java
  60. 61 0
      mybusiness/src/main/java/com/business/zhnc/salesArchives/service/ISyglSalesArchivesService.java
  61. 101 0
      mybusiness/src/main/java/com/business/zhnc/salesArchives/service/impl/SyglSalesArchivesServiceImpl.java
  62. 126 0
      mybusiness/src/main/java/com/business/zhnc/staffInfo/controller/SyglStaffInfoController.java
  63. 112 0
      mybusiness/src/main/java/com/business/zhnc/staffInfo/domain/SyglStaffInfo.java
  64. 61 0
      mybusiness/src/main/java/com/business/zhnc/staffInfo/mapper/SyglStaffInfoMapper.java
  65. 61 0
      mybusiness/src/main/java/com/business/zhnc/staffInfo/service/ISyglStaffInfoService.java
  66. 101 0
      mybusiness/src/main/java/com/business/zhnc/staffInfo/service/impl/SyglStaffInfoServiceImpl.java
  67. 57 0
      mybusiness/src/main/java/com/business/zhnc/syWeb/controller/SyWebController.java
  68. 33 0
      mybusiness/src/main/java/com/business/zhnc/visualizationDemo/visualizationDemoController.java
  69. 13 0
      mybusiness/src/main/java/com/business/zhnc/webSocket/WebSocketConfig.java
  70. 49 0
      mybusiness/src/main/java/com/business/zhnc/webSocket/Websocket.java
  71. 23 0
      mybusiness/src/main/java/com/business/zhnc/webSocket/WebsocketTest.java
  72. 26 0
      mybusiness/src/main/java/com/business/zhnc/website/controller/WebsiteController.java
  73. 114 0
      mybusiness/src/main/resources/mapper/cattleFarm/SyglCattleFarmMapper.xml
  74. 94 0
      mybusiness/src/main/resources/mapper/cattleGrowRecord/SyglCattleGrowRecordMapper.xml
  75. 159 0
      mybusiness/src/main/resources/mapper/cattleInfo/SyglCattleInfoMapper.xml
  76. 98 0
      mybusiness/src/main/resources/mapper/cowshedInfo/SyglCowshedInfoMapper.xml
  77. 109 0
      mybusiness/src/main/resources/mapper/diseaseArchives/SyglDiseaseArchivesMapper.xml
  78. 94 0
      mybusiness/src/main/resources/mapper/drugsArchives/SyglDrugsArchivesMapper.xml
  79. 94 0
      mybusiness/src/main/resources/mapper/fire/YjglFireMapper.xml
  80. 93 0
      mybusiness/src/main/resources/mapper/intrusion/YjglIntrusionMapper.xml
  81. 104 0
      mybusiness/src/main/resources/mapper/machiningArchives/SyglMachiningArchivesMapper.xml
  82. 141 0
      mybusiness/src/main/resources/mapper/residentUser/YyglResidentUserMapper.xml
  83. 104 0
      mybusiness/src/main/resources/mapper/salesArchives/SyglSalesArchivesMapper.xml
  84. 99 0
      mybusiness/src/main/resources/mapper/staffInfo/SyglStaffInfoMapper.xml
  85. 2589 0
      mybusiness/src/main/resources/templates/bigData/bigData.html
  86. 73 0
      mybusiness/src/main/resources/templates/cattleFarm/farm/add.html
  87. 74 0
      mybusiness/src/main/resources/templates/cattleFarm/farm/edit.html
  88. 134 0
      mybusiness/src/main/resources/templates/cattleFarm/farm/farm.html
  89. 51 0
      mybusiness/src/main/resources/templates/cattleGrowRecord/record/add.html
  90. 52 0
      mybusiness/src/main/resources/templates/cattleGrowRecord/record/edit.html
  91. 110 0
      mybusiness/src/main/resources/templates/cattleGrowRecord/record/record.html
  92. 188 0
      mybusiness/src/main/resources/templates/cattleInfo/info/add.html
  93. 312 0
      mybusiness/src/main/resources/templates/cattleInfo/info/edit.html
  94. 177 0
      mybusiness/src/main/resources/templates/cattleInfo/info/info.html
  95. 57 0
      mybusiness/src/main/resources/templates/cowshedInfo/info/add.html
  96. 58 0
      mybusiness/src/main/resources/templates/cowshedInfo/info/edit.html
  97. 110 0
      mybusiness/src/main/resources/templates/cowshedInfo/info/info.html
  98. 89 0
      mybusiness/src/main/resources/templates/diseaseArchives/archives/add.html
  99. 146 0
      mybusiness/src/main/resources/templates/diseaseArchives/archives/archives.html
  100. 0 0
      mybusiness/src/main/resources/templates/diseaseArchives/archives/edit.html

+ 109 - 0
mybusiness/pom.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>leisp</artifactId>
+        <groupId>com.leisp</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mybusiness</artifactId>
+
+    <description>
+        业务模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <!--		<dependency>-->
+        <!--			<groupId>com.leisp</groupId>-->
+        <!--			<artifactId>leisp-common</artifactId>-->
+        <!--		</dependency>-->
+        <!-- SpringBoot集成thymeleaf模板 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger2-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+
+        <!--防止进入swagger页面报类型转换错误,排除2.9.2中的引用,手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <!-- swagger2-UI-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.leisp</groupId>
+            <artifactId>leisp-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.leisp</groupId>
+            <artifactId>leisp-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.leisp</groupId>
+            <artifactId>leisp-generator</artifactId>
+        </dependency>
+
+        <!-- 业务依赖 -->
+        <dependency>
+            <groupId>com.leisp</groupId>
+            <artifactId>mybusiness</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.16</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--websocket-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 107 - 0
mybusiness/src/main/java/com/business/domain/SysFileInfo.java

@@ -0,0 +1,107 @@
+package com.business.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 附件操作对象 sys_file_info
+ * 
+ * @author lei_Wang
+ * @date 2020-10-29
+ */
+public class SysFileInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 附件主键 */
+    private Long id;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fileName;
+
+    /** 存放路径 */
+    @Excel(name = "存放路径")
+    private String filePath;
+
+    /** 附件类型 */
+    @Excel(name = "附件类型")
+    private Integer fileType;
+
+    /** 关联业务主键 */
+    @Excel(name = "关联业务主键")
+    private Long businessId;
+
+    /** 关联业务表名 */
+    @Excel(name = "关联业务表名")
+    private String businessTable;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFileName(String fileName) 
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() 
+    {
+        return fileName;
+    }
+    public void setFilePath(String filePath) 
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() 
+    {
+        return filePath;
+    }
+    public void setFileType(Integer fileType) 
+    {
+        this.fileType = fileType;
+    }
+
+    public Integer getFileType() 
+    {
+        return fileType;
+    }
+    public void setBusinessId(Long businessId) 
+    {
+        this.businessId = businessId;
+    }
+
+    public Long getBusinessId() 
+    {
+        return businessId;
+    }
+    public void setBusinessTable(String businessTable) 
+    {
+        this.businessTable = businessTable;
+    }
+
+    public String getBusinessTable() 
+    {
+        return businessTable;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fileName", getFileName())
+            .append("filePath", getFilePath())
+            .append("fileType", getFileType())
+            .append("businessId", getBusinessId())
+            .append("businessTable", getBusinessTable())
+            .toString();
+    }
+}

+ 16 - 0
mybusiness/src/main/java/com/business/tools/BasepathUtil.java

@@ -0,0 +1,16 @@
+package com.business.tools;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class BasepathUtil {
+    public static String getBasepath(){
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        String localAddr = request.getLocalAddr();
+        int serverPort = request.getServerPort();
+        return "http://"+localAddr +":"+ serverPort;
+    }
+}

+ 44 - 0
mybusiness/src/main/java/com/business/tools/UUID_Tools.java

@@ -0,0 +1,44 @@
+package com.business.tools;
+
+import java.util.UUID;
+
+public class UUID_Tools {
+
+	public UUID_Tools() {
+	}
+
+	/**
+	 * 获得�?个UUID
+	 *
+	 * @return String UUID
+	 */
+	public static String getUUID() {
+		String s = UUID.randomUUID().toString();
+		// 去掉�?-”符�?
+		return s.substring(0, 8) + s.substring(9, 13) + s.substring(14, 18) + s.substring(19, 23) + s.substring(24);
+	}
+
+	/**
+	 * 获得指定数目的UUID
+	 *
+	 * @param number
+	 *            int �?要获得的UUID数量
+	 * @return String[] UUID数组
+	 */
+	public static String[] getUUID(int number) {
+		if (number < 1) {
+			return null;
+		}
+		String[] ss = new String[number];
+		for (int i = 0; i < number; i++) {
+			ss[i] = getUUID();
+		}
+		return ss;
+	}
+
+	public static void main(String[] args) {
+		String ss = UUID_Tools.getUUID();
+		System.out.println(ss);
+	}
+
+}

+ 37 - 0
mybusiness/src/main/java/com/business/zhnc/bigData/controller/BigDataController.java

@@ -0,0 +1,37 @@
+package com.business.zhnc.bigData.controller;
+
+import com.sooka.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.websocket.server.ServerEndpoint;
+
+/**
+ * 大数据Controller
+ * @author wang_xy
+ * @description
+ * @Version 1.0
+ * @params
+ * @return
+ * @since 2022/5/10 15:04
+ */
+@Controller
+@RequestMapping("/bigData")
+public class BigDataController extends BaseController
+{
+    private String prefix = "bigData";
+
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/bigData";
+    }
+
+    @GetMapping("/ws/{info}")
+    public String webSocket(@PathVariable String info){
+        return info;
+    }
+
+}

+ 127 - 0
mybusiness/src/main/java/com/business/zhnc/cattleFarm/controller/SyglCattleFarmController.java

@@ -0,0 +1,127 @@
+package com.business.zhnc.cattleFarm.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+import com.business.zhnc.cattleFarm.service.ISyglCattleFarmService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 牛场信息Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/cattleFarm/farm")
+public class SyglCattleFarmController extends BaseController
+{
+    private String prefix = "cattleFarm/farm";
+
+    @Autowired
+    private ISyglCattleFarmService syglCattleFarmService;
+
+
+    @RequiresPermissions("cattleFarm:farm:view")
+    @GetMapping()
+    public String farm()
+    {
+        return prefix + "/farm";
+    }
+
+    /**
+     * 查询牛场信息列表
+     */
+    @RequiresPermissions("cattleFarm:farm:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglCattleFarm syglCattleFarm)
+    {
+        startPage();
+        List<SyglCattleFarm> list = syglCattleFarmService.selectSyglCattleFarmList(syglCattleFarm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出牛场信息列表
+     */
+    @RequiresPermissions("cattleFarm:farm:export")
+    @Log(title = "牛场信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglCattleFarm syglCattleFarm)
+    {
+        List<SyglCattleFarm> list = syglCattleFarmService.selectSyglCattleFarmList(syglCattleFarm);
+        ExcelUtil<SyglCattleFarm> util = new ExcelUtil<SyglCattleFarm>(SyglCattleFarm.class);
+        return util.exportExcel(list, "farm");
+    }
+
+    /**
+     * 新增牛场信息
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存牛场信息
+     */
+    @RequiresPermissions("cattleFarm:farm:add")
+    @Log(title = "牛场信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglCattleFarm syglCattleFarm)
+    {
+        return toAjax(syglCattleFarmService.insertSyglCattleFarm(syglCattleFarm));
+    }
+
+    /**
+     * 修改牛场信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglCattleFarm syglCattleFarm = syglCattleFarmService.selectSyglCattleFarmById(id);
+        mmap.put("syglCattleFarm", syglCattleFarm);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存牛场信息
+     */
+    @RequiresPermissions("cattleFarm:farm:edit")
+    @Log(title = "牛场信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglCattleFarm syglCattleFarm)
+    {
+        return toAjax(syglCattleFarmService.updateSyglCattleFarm(syglCattleFarm));
+    }
+
+    /**
+     * 删除牛场信息
+     */
+    @RequiresPermissions("cattleFarm:farm:remove")
+    @Log(title = "牛场信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglCattleFarmService.deleteSyglCattleFarmByIds(ids));
+    }
+}

+ 155 - 0
mybusiness/src/main/java/com/business/zhnc/cattleFarm/domain/SyglCattleFarm.java

@@ -0,0 +1,155 @@
+package com.business.zhnc.cattleFarm.domain;
+
+import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 牛场信息对象 sygl_cattle_farm
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public class SyglCattleFarm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 级别 */
+    @Excel(name = "级别")
+    private String level;
+
+    /** 牛场名称 */
+    @Excel(name = "牛场名称")
+    private String name;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String code;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String responsiblePerson;
+
+    /** 维度 */
+    @Excel(name = "维度")
+    private String latitude;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String synopsis;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setLevel(String level) 
+    {
+        this.level = level;
+    }
+
+    public String getLevel() 
+    {
+        return level;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setResponsiblePerson(String responsiblePerson) 
+    {
+        this.responsiblePerson = responsiblePerson;
+    }
+
+    public String getResponsiblePerson() 
+    {
+        return responsiblePerson;
+    }
+    public void setLatitude(String latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() 
+    {
+        return latitude;
+    }
+    public void setLongitude(String longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() 
+    {
+        return longitude;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setSynopsis(String synopsis) 
+    {
+        this.synopsis = synopsis;
+    }
+
+    public String getSynopsis() 
+    {
+        return synopsis;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("level", getLevel())
+            .append("name", getName())
+            .append("code", getCode())
+            .append("responsiblePerson", getResponsiblePerson())
+            .append("latitude", getLatitude())
+            .append("longitude", getLongitude())
+            .append("phone", getPhone())
+            .append("synopsis", getSynopsis())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleFarm/mapper/SyglCattleFarmMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleFarm.mapper;
+
+import java.util.List;
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+
+/**
+ * 牛场信息Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface SyglCattleFarmMapper 
+{
+    /**
+     * 查询牛场信息
+     * 
+     * @param id 牛场信息ID
+     * @return 牛场信息
+     */
+    public SyglCattleFarm selectSyglCattleFarmById(String id);
+
+    /**
+     * 查询牛场信息列表
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 牛场信息集合
+     */
+    public List<SyglCattleFarm> selectSyglCattleFarmList(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 新增牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    public int insertSyglCattleFarm(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 修改牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    public int updateSyglCattleFarm(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 删除牛场信息
+     * 
+     * @param id 牛场信息ID
+     * @return 结果
+     */
+    public int deleteSyglCattleFarmById(String id);
+
+    /**
+     * 批量删除牛场信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleFarmByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleFarm/service/ISyglCattleFarmService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleFarm.service;
+
+import java.util.List;
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+
+/**
+ * 牛场信息Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface ISyglCattleFarmService 
+{
+    /**
+     * 查询牛场信息
+     * 
+     * @param id 牛场信息ID
+     * @return 牛场信息
+     */
+    public SyglCattleFarm selectSyglCattleFarmById(String id);
+
+    /**
+     * 查询牛场信息列表
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 牛场信息集合
+     */
+    public List<SyglCattleFarm> selectSyglCattleFarmList(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 新增牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    public int insertSyglCattleFarm(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 修改牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    public int updateSyglCattleFarm(SyglCattleFarm syglCattleFarm);
+
+    /**
+     * 批量删除牛场信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleFarmByIds(String ids);
+
+    /**
+     * 删除牛场信息信息
+     * 
+     * @param id 牛场信息ID
+     * @return 结果
+     */
+    public int deleteSyglCattleFarmById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/cattleFarm/service/impl/SyglCattleFarmServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.cattleFarm.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.cattleFarm.mapper.SyglCattleFarmMapper;
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+import com.business.zhnc.cattleFarm.service.ISyglCattleFarmService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 牛场信息Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class SyglCattleFarmServiceImpl implements ISyglCattleFarmService 
+{
+    @Autowired
+    private SyglCattleFarmMapper syglCattleFarmMapper;
+
+    /**
+     * 查询牛场信息
+     * 
+     * @param id 牛场信息ID
+     * @return 牛场信息
+     */
+    @Override
+    public SyglCattleFarm selectSyglCattleFarmById(String id)
+    {
+        return syglCattleFarmMapper.selectSyglCattleFarmById(id);
+    }
+
+    /**
+     * 查询牛场信息列表
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 牛场信息
+     */
+    @Override
+    public List<SyglCattleFarm> selectSyglCattleFarmList(SyglCattleFarm syglCattleFarm)
+    {
+        return syglCattleFarmMapper.selectSyglCattleFarmList(syglCattleFarm);
+    }
+
+    /**
+     * 新增牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    @Override
+    public int insertSyglCattleFarm(SyglCattleFarm syglCattleFarm)
+    {
+        syglCattleFarm.setId(ShiroUtils.uuid());
+        syglCattleFarm.setCreateTime(DateUtils.getNowDate());
+        syglCattleFarm.setCreateBy(ShiroUtils.getLoginName());
+        return syglCattleFarmMapper.insertSyglCattleFarm(syglCattleFarm);
+    }
+
+    /**
+     * 修改牛场信息
+     * 
+     * @param syglCattleFarm 牛场信息
+     * @return 结果
+     */
+    @Override
+    public int updateSyglCattleFarm(SyglCattleFarm syglCattleFarm)
+    {
+        syglCattleFarm.setUpdateTime(DateUtils.getNowDate());
+        syglCattleFarm.setUpdateBy(ShiroUtils.getLoginName());
+        return syglCattleFarmMapper.updateSyglCattleFarm(syglCattleFarm);
+    }
+
+    /**
+     * 删除牛场信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleFarmByIds(String ids)
+    {
+        return syglCattleFarmMapper.deleteSyglCattleFarmByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除牛场信息信息
+     * 
+     * @param id 牛场信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleFarmById(String id)
+    {
+        return syglCattleFarmMapper.deleteSyglCattleFarmById(id);
+    }
+}

+ 133 - 0
mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/controller/SyglCattleGrowRecordController.java

@@ -0,0 +1,133 @@
+package com.business.zhnc.cattleGrowRecord.controller;
+
+import java.util.List;
+
+import com.business.zhnc.cattleInfo.domain.SyglCattleInfo;
+import com.business.zhnc.cattleInfo.service.ISyglCattleInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.cattleGrowRecord.domain.SyglCattleGrowRecord;
+import com.business.zhnc.cattleGrowRecord.service.ISyglCattleGrowRecordService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 牛只成长记录Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/cattleGrowRecord/record")
+public class SyglCattleGrowRecordController extends BaseController
+{
+    private String prefix = "cattleGrowRecord/record";
+
+    @Autowired
+    private ISyglCattleGrowRecordService syglCattleGrowRecordService;
+    @Autowired
+    private ISyglCattleInfoService syglCattleInfoService;
+
+    @RequiresPermissions("cattleGrowRecord:record:view")
+    @GetMapping()
+    public String record()
+    {
+        return prefix + "/record";
+    }
+
+    /**
+     * 查询牛只成长记录列表
+     */
+    @RequiresPermissions("cattleGrowRecord:record:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        startPage();
+        List<SyglCattleGrowRecord> list = syglCattleGrowRecordService.selectSyglCattleGrowRecordList(syglCattleGrowRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出牛只成长记录列表
+     */
+    @RequiresPermissions("cattleGrowRecord:record:export")
+    @Log(title = "牛只成长记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        List<SyglCattleGrowRecord> list = syglCattleGrowRecordService.selectSyglCattleGrowRecordList(syglCattleGrowRecord);
+        ExcelUtil<SyglCattleGrowRecord> util = new ExcelUtil<SyglCattleGrowRecord>(SyglCattleGrowRecord.class);
+        return util.exportExcel(list, "record");
+    }
+
+    /**
+     * 新增牛只成长记录
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("list",syglCattleInfoService.selectSyglCattleInfoList(new SyglCattleInfo()));
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存牛只成长记录
+     */
+    @RequiresPermissions("cattleGrowRecord:record:add")
+    @Log(title = "牛只成长记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        return toAjax(syglCattleGrowRecordService.insertSyglCattleGrowRecord(syglCattleGrowRecord));
+    }
+
+    /**
+     * 修改牛只成长记录
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglCattleGrowRecord syglCattleGrowRecord = syglCattleGrowRecordService.selectSyglCattleGrowRecordById(id);
+        mmap.put("syglCattleGrowRecord", syglCattleGrowRecord);
+        mmap.put("list",syglCattleInfoService.selectSyglCattleInfoList(new SyglCattleInfo()));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存牛只成长记录
+     */
+    @RequiresPermissions("cattleGrowRecord:record:edit")
+    @Log(title = "牛只成长记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        return toAjax(syglCattleGrowRecordService.updateSyglCattleGrowRecord(syglCattleGrowRecord));
+    }
+
+    /**
+     * 删除牛只成长记录
+     */
+    @RequiresPermissions("cattleGrowRecord:record:remove")
+    @Log(title = "牛只成长记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglCattleGrowRecordService.deleteSyglCattleGrowRecordByIds(ids));
+    }
+}

+ 98 - 0
mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/domain/SyglCattleGrowRecord.java

@@ -0,0 +1,98 @@
+package com.business.zhnc.cattleGrowRecord.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 牛只成长记录对象 sygl_cattle_grow_record
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public class SyglCattleGrowRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 牛只id */
+    @Excel(name = "牛只id")
+    private String cattleId;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 体温 */
+    @Excel(name = "体温")
+    private String temperature;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setCattleId(String cattleId) 
+    {
+        this.cattleId = cattleId;
+    }
+
+    public String getCattleId() 
+    {
+        return cattleId;
+    }
+    public void setAge(String age) 
+    {
+        this.age = age;
+    }
+
+    public String getAge() 
+    {
+        return age;
+    }
+    public void setWeight(String weight) 
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight() 
+    {
+        return weight;
+    }
+    public void setTemperature(String temperature) 
+    {
+        this.temperature = temperature;
+    }
+
+    public String getTemperature() 
+    {
+        return temperature;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("cattleId", getCattleId())
+            .append("age", getAge())
+            .append("weight", getWeight())
+            .append("temperature", getTemperature())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/mapper/SyglCattleGrowRecordMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleGrowRecord.mapper;
+
+import java.util.List;
+import com.business.zhnc.cattleGrowRecord.domain.SyglCattleGrowRecord;
+
+/**
+ * 牛只成长记录Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface SyglCattleGrowRecordMapper 
+{
+    /**
+     * 查询牛只成长记录
+     * 
+     * @param id 牛只成长记录ID
+     * @return 牛只成长记录
+     */
+    public SyglCattleGrowRecord selectSyglCattleGrowRecordById(String id);
+
+    /**
+     * 查询牛只成长记录列表
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 牛只成长记录集合
+     */
+    public List<SyglCattleGrowRecord> selectSyglCattleGrowRecordList(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 新增牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    public int insertSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 修改牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    public int updateSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 删除牛只成长记录
+     * 
+     * @param id 牛只成长记录ID
+     * @return 结果
+     */
+    public int deleteSyglCattleGrowRecordById(String id);
+
+    /**
+     * 批量删除牛只成长记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleGrowRecordByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/service/ISyglCattleGrowRecordService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleGrowRecord.service;
+
+import java.util.List;
+import com.business.zhnc.cattleGrowRecord.domain.SyglCattleGrowRecord;
+
+/**
+ * 牛只成长记录Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface ISyglCattleGrowRecordService 
+{
+    /**
+     * 查询牛只成长记录
+     * 
+     * @param id 牛只成长记录ID
+     * @return 牛只成长记录
+     */
+    public SyglCattleGrowRecord selectSyglCattleGrowRecordById(String id);
+
+    /**
+     * 查询牛只成长记录列表
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 牛只成长记录集合
+     */
+    public List<SyglCattleGrowRecord> selectSyglCattleGrowRecordList(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 新增牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    public int insertSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 修改牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    public int updateSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord);
+
+    /**
+     * 批量删除牛只成长记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleGrowRecordByIds(String ids);
+
+    /**
+     * 删除牛只成长记录信息
+     * 
+     * @param id 牛只成长记录ID
+     * @return 结果
+     */
+    public int deleteSyglCattleGrowRecordById(String id);
+}

+ 102 - 0
mybusiness/src/main/java/com/business/zhnc/cattleGrowRecord/service/impl/SyglCattleGrowRecordServiceImpl.java

@@ -0,0 +1,102 @@
+package com.business.zhnc.cattleGrowRecord.service.impl;
+
+import java.util.List;
+
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.cattleGrowRecord.mapper.SyglCattleGrowRecordMapper;
+import com.business.zhnc.cattleGrowRecord.domain.SyglCattleGrowRecord;
+import com.business.zhnc.cattleGrowRecord.service.ISyglCattleGrowRecordService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 牛只成长记录Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class SyglCattleGrowRecordServiceImpl implements ISyglCattleGrowRecordService 
+{
+    @Autowired
+    private SyglCattleGrowRecordMapper syglCattleGrowRecordMapper;
+
+    /**
+     * 查询牛只成长记录
+     * 
+     * @param id 牛只成长记录ID
+     * @return 牛只成长记录
+     */
+    @Override
+    public SyglCattleGrowRecord selectSyglCattleGrowRecordById(String id)
+    {
+        return syglCattleGrowRecordMapper.selectSyglCattleGrowRecordById(id);
+    }
+
+    /**
+     * 查询牛只成长记录列表
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 牛只成长记录
+     */
+    @Override
+    public List<SyglCattleGrowRecord> selectSyglCattleGrowRecordList(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        return syglCattleGrowRecordMapper.selectSyglCattleGrowRecordList(syglCattleGrowRecord);
+    }
+
+    /**
+     * 新增牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    @Override
+    public int insertSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        syglCattleGrowRecord.setId(ShiroUtils.uuid());
+        syglCattleGrowRecord.setCreateTime(DateUtils.getNowDate());
+        syglCattleGrowRecord.setCreateBy(ShiroUtils.getLoginName());
+        return syglCattleGrowRecordMapper.insertSyglCattleGrowRecord(syglCattleGrowRecord);
+    }
+
+    /**
+     * 修改牛只成长记录
+     * 
+     * @param syglCattleGrowRecord 牛只成长记录
+     * @return 结果
+     */
+    @Override
+    public int updateSyglCattleGrowRecord(SyglCattleGrowRecord syglCattleGrowRecord)
+    {
+        syglCattleGrowRecord.setUpdateTime(DateUtils.getNowDate());
+        syglCattleGrowRecord.setUpdateBy(ShiroUtils.getLoginName());
+        return syglCattleGrowRecordMapper.updateSyglCattleGrowRecord(syglCattleGrowRecord);
+    }
+
+    /**
+     * 删除牛只成长记录对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleGrowRecordByIds(String ids)
+    {
+        return syglCattleGrowRecordMapper.deleteSyglCattleGrowRecordByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除牛只成长记录信息
+     * 
+     * @param id 牛只成长记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleGrowRecordById(String id)
+    {
+        return syglCattleGrowRecordMapper.deleteSyglCattleGrowRecordById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/cattleInfo/controller/SyglCattleInfoController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.cattleInfo.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.cattleInfo.domain.SyglCattleInfo;
+import com.business.zhnc.cattleInfo.service.ISyglCattleInfoService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 牛只信息管理Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/cattleInfo/info")
+public class SyglCattleInfoController extends BaseController
+{
+    private String prefix = "cattleInfo/info";
+
+    @Autowired
+    private ISyglCattleInfoService syglCattleInfoService;
+
+    @RequiresPermissions("cattleInfo:info:view")
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/info";
+    }
+
+    /**
+     * 查询牛只信息管理列表
+     */
+    @RequiresPermissions("cattleInfo:info:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglCattleInfo syglCattleInfo)
+    {
+        startPage();
+        List<SyglCattleInfo> list = syglCattleInfoService.selectSyglCattleInfoList(syglCattleInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出牛只信息管理列表
+     */
+    @RequiresPermissions("cattleInfo:info:export")
+    @Log(title = "牛只信息管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglCattleInfo syglCattleInfo)
+    {
+        List<SyglCattleInfo> list = syglCattleInfoService.selectSyglCattleInfoList(syglCattleInfo);
+        ExcelUtil<SyglCattleInfo> util = new ExcelUtil<SyglCattleInfo>(SyglCattleInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 新增牛只信息管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存牛只信息管理
+     */
+    @RequiresPermissions("cattleInfo:info:add")
+    @Log(title = "牛只信息管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglCattleInfo syglCattleInfo)
+    {
+        return toAjax(syglCattleInfoService.insertSyglCattleInfo(syglCattleInfo));
+    }
+
+    /**
+     * 修改牛只信息管理
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglCattleInfo syglCattleInfo = syglCattleInfoService.selectSyglCattleInfoById(id);
+        mmap.put("syglCattleInfo", syglCattleInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存牛只信息管理
+     */
+    @RequiresPermissions("cattleInfo:info:edit")
+    @Log(title = "牛只信息管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglCattleInfo syglCattleInfo)
+    {
+        return toAjax(syglCattleInfoService.updateSyglCattleInfo(syglCattleInfo));
+    }
+
+    /**
+     * 删除牛只信息管理
+     */
+    @RequiresPermissions("cattleInfo:info:remove")
+    @Log(title = "牛只信息管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglCattleInfoService.deleteSyglCattleInfoByIds(ids));
+    }
+}

+ 280 - 0
mybusiness/src/main/java/com/business/zhnc/cattleInfo/domain/SyglCattleInfo.java

@@ -0,0 +1,280 @@
+package com.business.zhnc.cattleInfo.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 牛只信息管理对象 sygl_cattle_info
+ *
+ * @author lei
+ * @date 2022-05-04
+ */
+public class SyglCattleInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String no;
+
+    /** 是否被认养 */
+    @Excel(name = "是否被认养")
+    private String isAdopt;
+
+    /** 是否入住牛只 */
+    @Excel(name = "是否入住牛只")
+    private String isCheckin;
+
+    /** 是否出栏牛只 */
+    @Excel(name = "是否出栏")
+    private String isChulan;
+
+    /** 是否种牛 */
+    @Excel(name = "是否种牛")
+    private String isCattle;
+
+    /** 初始体重 */
+    @Excel(name = "初始体重")
+    private String initialWeight;
+
+    /** 品种 */
+    @Excel(name = "品种")
+    private String variety;
+
+    /** 入社月龄 */
+    @Excel(name = "入社月龄")
+    private String monthAge;
+
+    /** 养殖开始时间 */
+    @Excel(name = "养殖开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 预计出舍时间 */
+    @Excel(name = "预计出舍时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryTime;
+
+    /** 屠宰时间 */
+    @Excel(name = "屠宰时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date slaughterTime;
+
+    /** 生长周期 */
+    @Excel(name = "生长周期")
+    private String growthCycle;
+
+    /** 养殖状态 */
+    @Excel(name = "养殖状态")
+    private String status;
+
+    /** 设备码 */
+    @Excel(name = "设备码")
+    private String code;
+
+    /** 溯源二维码 */
+    @Excel(name = "溯源二维码")
+    private String qrCode;
+
+    /** 采购成本 */
+    @Excel(name = "采购成本")
+    private String purchaseCost;
+
+    /** 图片附件 */
+    @Excel(name = "图片附件")
+    private String filePath;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setNo(String no)
+    {
+        this.no = no;
+    }
+
+    public String getNo()
+    {
+        return no;
+    }
+    public void setIsAdopt(String isAdopt)
+    {
+        this.isAdopt = isAdopt;
+    }
+
+    public String getIsAdopt()
+    {
+        return isAdopt;
+    }
+    public void setIsCheckin(String isCheckin)
+    {
+        this.isCheckin = isCheckin;
+    }
+
+    public String getIsCheckin()
+    {
+        return isCheckin;
+    }
+    public void setIsCattle(String isCattle)
+    {
+        this.isCattle = isCattle;
+    }
+
+    public String getIsCattle()
+    {
+        return isCattle;
+    }
+    public void setInitialWeight(String initialWeight)
+    {
+        this.initialWeight = initialWeight;
+    }
+
+    public String getInitialWeight()
+    {
+        return initialWeight;
+    }
+    public void setVariety(String variety)
+    {
+        this.variety = variety;
+    }
+
+    public String getVariety()
+    {
+        return variety;
+    }
+    public void setMonthAge(String monthAge)
+    {
+        this.monthAge = monthAge;
+    }
+
+    public String getMonthAge()
+    {
+        return monthAge;
+    }
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+    public void setDeliveryTime(Date deliveryTime)
+    {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public Date getDeliveryTime()
+    {
+        return deliveryTime;
+    }
+    public void setSlaughterTime(Date slaughterTime)
+    {
+        this.slaughterTime = slaughterTime;
+    }
+
+    public Date getSlaughterTime()
+    {
+        return slaughterTime;
+    }
+    public void setGrowthCycle(String growthCycle)
+    {
+        this.growthCycle = growthCycle;
+    }
+
+    public String getGrowthCycle()
+    {
+        return growthCycle;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+    public void setQrCode(String qrCode)
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode()
+    {
+        return qrCode;
+    }
+    public void setPurchaseCost(String purchaseCost)
+    {
+        this.purchaseCost = purchaseCost;
+    }
+
+    public String getPurchaseCost()
+    {
+        return purchaseCost;
+    }
+    public void setFilePath(String filePath)
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath()
+    {
+        return filePath;
+    }
+
+    public String getIsChulan() {
+        return isChulan;
+    }
+
+    public void setIsChulan(String isChulan) {
+        this.isChulan = isChulan;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("no", getNo())
+            .append("isAdopt", getIsAdopt())
+            .append("isCheckin", getIsCheckin())
+            .append("isCattle", getIsCattle())
+            .append("initialWeight", getInitialWeight())
+            .append("variety", getVariety())
+            .append("monthAge", getMonthAge())
+            .append("startTime", getStartTime())
+            .append("deliveryTime", getDeliveryTime())
+            .append("slaughterTime", getSlaughterTime())
+            .append("growthCycle", getGrowthCycle())
+            .append("status", getStatus())
+            .append("code", getCode())
+            .append("qrCode", getQrCode())
+            .append("purchaseCost", getPurchaseCost())
+            .append("filePath", getFilePath())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .append("isChulan", getIsChulan())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleInfo/mapper/SyglCattleInfoMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleInfo.mapper;
+
+import java.util.List;
+import com.business.zhnc.cattleInfo.domain.SyglCattleInfo;
+
+/**
+ * 牛只信息管理Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface SyglCattleInfoMapper 
+{
+    /**
+     * 查询牛只信息管理
+     * 
+     * @param id 牛只信息管理ID
+     * @return 牛只信息管理
+     */
+    public SyglCattleInfo selectSyglCattleInfoById(String id);
+
+    /**
+     * 查询牛只信息管理列表
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 牛只信息管理集合
+     */
+    public List<SyglCattleInfo> selectSyglCattleInfoList(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 新增牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    public int insertSyglCattleInfo(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 修改牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    public int updateSyglCattleInfo(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 删除牛只信息管理
+     * 
+     * @param id 牛只信息管理ID
+     * @return 结果
+     */
+    public int deleteSyglCattleInfoById(String id);
+
+    /**
+     * 批量删除牛只信息管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleInfoByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cattleInfo/service/ISyglCattleInfoService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cattleInfo.service;
+
+import java.util.List;
+import com.business.zhnc.cattleInfo.domain.SyglCattleInfo;
+
+/**
+ * 牛只信息管理Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface ISyglCattleInfoService 
+{
+    /**
+     * 查询牛只信息管理
+     * 
+     * @param id 牛只信息管理ID
+     * @return 牛只信息管理
+     */
+    public SyglCattleInfo selectSyglCattleInfoById(String id);
+
+    /**
+     * 查询牛只信息管理列表
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 牛只信息管理集合
+     */
+    public List<SyglCattleInfo> selectSyglCattleInfoList(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 新增牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    public int insertSyglCattleInfo(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 修改牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    public int updateSyglCattleInfo(SyglCattleInfo syglCattleInfo);
+
+    /**
+     * 批量删除牛只信息管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCattleInfoByIds(String ids);
+
+    /**
+     * 删除牛只信息管理信息
+     * 
+     * @param id 牛只信息管理ID
+     * @return 结果
+     */
+    public int deleteSyglCattleInfoById(String id);
+}

+ 109 - 0
mybusiness/src/main/java/com/business/zhnc/cattleInfo/service/impl/SyglCattleInfoServiceImpl.java

@@ -0,0 +1,109 @@
+package com.business.zhnc.cattleInfo.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.cattleInfo.mapper.SyglCattleInfoMapper;
+import com.business.zhnc.cattleInfo.domain.SyglCattleInfo;
+import com.business.zhnc.cattleInfo.service.ISyglCattleInfoService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 牛只信息管理Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class SyglCattleInfoServiceImpl implements ISyglCattleInfoService 
+{
+    @Autowired
+    private SyglCattleInfoMapper syglCattleInfoMapper;
+
+    /**
+     * 查询牛只信息管理
+     * 
+     * @param id 牛只信息管理ID
+     * @return 牛只信息管理
+     */
+    @Override
+    public SyglCattleInfo selectSyglCattleInfoById(String id)
+    {
+        return syglCattleInfoMapper.selectSyglCattleInfoById(id);
+    }
+
+    /**
+     * 查询牛只信息管理列表
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 牛只信息管理
+     */
+    @Override
+    public List<SyglCattleInfo> selectSyglCattleInfoList(SyglCattleInfo syglCattleInfo)
+    {
+        return syglCattleInfoMapper.selectSyglCattleInfoList(syglCattleInfo);
+    }
+
+    /**
+     * 新增牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    @Override
+    public int insertSyglCattleInfo(SyglCattleInfo syglCattleInfo)
+    {
+        syglCattleInfo.setId(ShiroUtils.uuid());
+        syglCattleInfo.setCreateTime(DateUtils.getNowDate());
+        syglCattleInfo.setCreateBy(ShiroUtils.getLoginName());
+        String fileObject = syglCattleInfo.getFilePath();
+        if(fileObject!=null&&!"".equals(fileObject)){
+            int index = fileObject.lastIndexOf(",")+1;
+            if(index==fileObject.length()){
+                String newFileObject=fileObject.substring(0,fileObject.length()-1);
+                syglCattleInfo.setFilePath(newFileObject);
+            }
+        }
+        return syglCattleInfoMapper.insertSyglCattleInfo(syglCattleInfo);
+    }
+
+    /**
+     * 修改牛只信息管理
+     * 
+     * @param syglCattleInfo 牛只信息管理
+     * @return 结果
+     */
+    @Override
+    public int updateSyglCattleInfo(SyglCattleInfo syglCattleInfo)
+    {
+        syglCattleInfo.setUpdateTime(DateUtils.getNowDate());
+        syglCattleInfo.setUpdateBy(ShiroUtils.getLoginName());
+        return syglCattleInfoMapper.updateSyglCattleInfo(syglCattleInfo);
+    }
+
+    /**
+     * 删除牛只信息管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleInfoByIds(String ids)
+    {
+        return syglCattleInfoMapper.deleteSyglCattleInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除牛只信息管理信息
+     * 
+     * @param id 牛只信息管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCattleInfoById(String id)
+    {
+        return syglCattleInfoMapper.deleteSyglCattleInfoById(id);
+    }
+}

+ 134 - 0
mybusiness/src/main/java/com/business/zhnc/cowshedInfo/controller/SyglCowshedInfoController.java

@@ -0,0 +1,134 @@
+package com.business.zhnc.cowshedInfo.controller;
+
+import java.util.List;
+
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+import com.business.zhnc.cattleFarm.service.ISyglCattleFarmService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.cowshedInfo.domain.SyglCowshedInfo;
+import com.business.zhnc.cowshedInfo.service.ISyglCowshedInfoService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 牛舍信息Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/cowshedInfo/info")
+public class SyglCowshedInfoController extends BaseController
+{
+    private String prefix = "cowshedInfo/info";
+
+    @Autowired
+    private ISyglCowshedInfoService syglCowshedInfoService;
+    @Autowired
+    private ISyglCattleFarmService syglCattleFarmService;
+
+    @RequiresPermissions("cowshedInfo:info:view")
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/info";
+    }
+
+    /**
+     * 查询牛舍信息列表
+     */
+    @RequiresPermissions("cowshedInfo:info:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglCowshedInfo syglCowshedInfo)
+    {
+        startPage();
+        List<SyglCowshedInfo> list = syglCowshedInfoService.selectSyglCowshedInfoList(syglCowshedInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出牛舍信息列表
+     */
+    @RequiresPermissions("cowshedInfo:info:export")
+    @Log(title = "牛舍信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglCowshedInfo syglCowshedInfo)
+    {
+        List<SyglCowshedInfo> list = syglCowshedInfoService.selectSyglCowshedInfoList(syglCowshedInfo);
+        ExcelUtil<SyglCowshedInfo> util = new ExcelUtil<SyglCowshedInfo>(SyglCowshedInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 新增牛舍信息
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存牛舍信息
+     */
+    @RequiresPermissions("cowshedInfo:info:add")
+    @Log(title = "牛舍信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglCowshedInfo syglCowshedInfo)
+    {
+        return toAjax(syglCowshedInfoService.insertSyglCowshedInfo(syglCowshedInfo));
+    }
+
+    /**
+     * 修改牛舍信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglCowshedInfo syglCowshedInfo = syglCowshedInfoService.selectSyglCowshedInfoById(id);
+        mmap.put("syglCowshedInfo", syglCowshedInfo);
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存牛舍信息
+     */
+    @RequiresPermissions("cowshedInfo:info:edit")
+    @Log(title = "牛舍信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglCowshedInfo syglCowshedInfo)
+    {
+        return toAjax(syglCowshedInfoService.updateSyglCowshedInfo(syglCowshedInfo));
+    }
+
+    /**
+     * 删除牛舍信息
+     */
+    @RequiresPermissions("cowshedInfo:info:remove")
+    @Log(title = "牛舍信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglCowshedInfoService.deleteSyglCowshedInfoByIds(ids));
+    }
+}

+ 111 - 0
mybusiness/src/main/java/com/business/zhnc/cowshedInfo/domain/SyglCowshedInfo.java

@@ -0,0 +1,111 @@
+package com.business.zhnc.cowshedInfo.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 牛舍信息对象 sygl_cowshed_info
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public class SyglCowshedInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String code;
+
+    /** 容纳数据量 */
+    @Excel(name = "容纳数据量")
+    private String accommodateNum;
+
+    /** 品种 */
+    @Excel(name = "品种")
+    private String varieties;
+
+    /** null */
+    private String cattleFarmId;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setAccommodateNum(String accommodateNum) 
+    {
+        this.accommodateNum = accommodateNum;
+    }
+
+    public String getAccommodateNum() 
+    {
+        return accommodateNum;
+    }
+    public void setVarieties(String varieties) 
+    {
+        this.varieties = varieties;
+    }
+
+    public String getVarieties() 
+    {
+        return varieties;
+    }
+    public void setCattleFarmId(String cattleFarmId) 
+    {
+        this.cattleFarmId = cattleFarmId;
+    }
+
+    public String getCattleFarmId() 
+    {
+        return cattleFarmId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("code", getCode())
+            .append("accommodateNum", getAccommodateNum())
+            .append("varieties", getVarieties())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .append("cattleFarmId", getCattleFarmId())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cowshedInfo/mapper/SyglCowshedInfoMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cowshedInfo.mapper;
+
+import java.util.List;
+import com.business.zhnc.cowshedInfo.domain.SyglCowshedInfo;
+
+/**
+ * 牛舍信息Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface SyglCowshedInfoMapper 
+{
+    /**
+     * 查询牛舍信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 牛舍信息
+     */
+    public SyglCowshedInfo selectSyglCowshedInfoById(String id);
+
+    /**
+     * 查询牛舍信息列表
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 牛舍信息集合
+     */
+    public List<SyglCowshedInfo> selectSyglCowshedInfoList(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 新增牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    public int insertSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 修改牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    public int updateSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 删除牛舍信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 结果
+     */
+    public int deleteSyglCowshedInfoById(String id);
+
+    /**
+     * 批量删除牛舍信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCowshedInfoByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/cowshedInfo/service/ISyglCowshedInfoService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.cowshedInfo.service;
+
+import java.util.List;
+import com.business.zhnc.cowshedInfo.domain.SyglCowshedInfo;
+
+/**
+ * 牛舍信息Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface ISyglCowshedInfoService 
+{
+    /**
+     * 查询牛舍信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 牛舍信息
+     */
+    public SyglCowshedInfo selectSyglCowshedInfoById(String id);
+
+    /**
+     * 查询牛舍信息列表
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 牛舍信息集合
+     */
+    public List<SyglCowshedInfo> selectSyglCowshedInfoList(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 新增牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    public int insertSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 修改牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    public int updateSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo);
+
+    /**
+     * 批量删除牛舍信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglCowshedInfoByIds(String ids);
+
+    /**
+     * 删除牛舍信息信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 结果
+     */
+    public int deleteSyglCowshedInfoById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/cowshedInfo/service/impl/SyglCowshedInfoServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.cowshedInfo.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.cowshedInfo.mapper.SyglCowshedInfoMapper;
+import com.business.zhnc.cowshedInfo.domain.SyglCowshedInfo;
+import com.business.zhnc.cowshedInfo.service.ISyglCowshedInfoService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 牛舍信息Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class SyglCowshedInfoServiceImpl implements ISyglCowshedInfoService 
+{
+    @Autowired
+    private SyglCowshedInfoMapper syglCowshedInfoMapper;
+
+    /**
+     * 查询牛舍信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 牛舍信息
+     */
+    @Override
+    public SyglCowshedInfo selectSyglCowshedInfoById(String id)
+    {
+        return syglCowshedInfoMapper.selectSyglCowshedInfoById(id);
+    }
+
+    /**
+     * 查询牛舍信息列表
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 牛舍信息
+     */
+    @Override
+    public List<SyglCowshedInfo> selectSyglCowshedInfoList(SyglCowshedInfo syglCowshedInfo)
+    {
+        return syglCowshedInfoMapper.selectSyglCowshedInfoList(syglCowshedInfo);
+    }
+
+    /**
+     * 新增牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    @Override
+    public int insertSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo)
+    {
+        syglCowshedInfo.setId(ShiroUtils.uuid());
+        syglCowshedInfo.setCreateTime(DateUtils.getNowDate());
+        syglCowshedInfo.setCreateBy(ShiroUtils.getLoginName());
+        return syglCowshedInfoMapper.insertSyglCowshedInfo(syglCowshedInfo);
+    }
+
+    /**
+     * 修改牛舍信息
+     * 
+     * @param syglCowshedInfo 牛舍信息
+     * @return 结果
+     */
+    @Override
+    public int updateSyglCowshedInfo(SyglCowshedInfo syglCowshedInfo)
+    {
+        syglCowshedInfo.setUpdateTime(DateUtils.getNowDate());
+        syglCowshedInfo.setUpdateBy(ShiroUtils.getLoginName());
+        return syglCowshedInfoMapper.updateSyglCowshedInfo(syglCowshedInfo);
+    }
+
+    /**
+     * 删除牛舍信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCowshedInfoByIds(String ids)
+    {
+        return syglCowshedInfoMapper.deleteSyglCowshedInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除牛舍信息信息
+     * 
+     * @param id 牛舍信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglCowshedInfoById(String id)
+    {
+        return syglCowshedInfoMapper.deleteSyglCowshedInfoById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/diseaseArchives/controller/SyglDiseaseArchivesController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.diseaseArchives.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.diseaseArchives.domain.SyglDiseaseArchives;
+import com.business.zhnc.diseaseArchives.service.ISyglDiseaseArchivesService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 疾病档案Controller
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Controller
+@RequestMapping("/diseaseArchives/archives")
+public class SyglDiseaseArchivesController extends BaseController
+{
+    private String prefix = "diseaseArchives/archives";
+
+    @Autowired
+    private ISyglDiseaseArchivesService syglDiseaseArchivesService;
+
+    @RequiresPermissions("diseaseArchives:archives:view")
+    @GetMapping()
+    public String archives()
+    {
+        return prefix + "/archives";
+    }
+
+    /**
+     * 查询疾病档案列表
+     */
+    @RequiresPermissions("diseaseArchives:archives:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        startPage();
+        List<SyglDiseaseArchives> list = syglDiseaseArchivesService.selectSyglDiseaseArchivesList(syglDiseaseArchives);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出疾病档案列表
+     */
+    @RequiresPermissions("diseaseArchives:archives:export")
+    @Log(title = "疾病档案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        List<SyglDiseaseArchives> list = syglDiseaseArchivesService.selectSyglDiseaseArchivesList(syglDiseaseArchives);
+        ExcelUtil<SyglDiseaseArchives> util = new ExcelUtil<SyglDiseaseArchives>(SyglDiseaseArchives.class);
+        return util.exportExcel(list, "archives");
+    }
+
+    /**
+     * 新增疾病档案
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存疾病档案
+     */
+    @RequiresPermissions("diseaseArchives:archives:add")
+    @Log(title = "疾病档案", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        return toAjax(syglDiseaseArchivesService.insertSyglDiseaseArchives(syglDiseaseArchives));
+    }
+
+    /**
+     * 修改疾病档案
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglDiseaseArchives syglDiseaseArchives = syglDiseaseArchivesService.selectSyglDiseaseArchivesById(id);
+        mmap.put("syglDiseaseArchives", syglDiseaseArchives);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存疾病档案
+     */
+    @RequiresPermissions("diseaseArchives:archives:edit")
+    @Log(title = "疾病档案", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        return toAjax(syglDiseaseArchivesService.updateSyglDiseaseArchives(syglDiseaseArchives));
+    }
+
+    /**
+     * 删除疾病档案
+     */
+    @RequiresPermissions("diseaseArchives:archives:remove")
+    @Log(title = "疾病档案", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglDiseaseArchivesService.deleteSyglDiseaseArchivesByIds(ids));
+    }
+}

+ 141 - 0
mybusiness/src/main/java/com/business/zhnc/diseaseArchives/domain/SyglDiseaseArchives.java

@@ -0,0 +1,141 @@
+package com.business.zhnc.diseaseArchives.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 疾病档案对象 sygl_disease_archives
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public class SyglDiseaseArchives extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 牛只编号 */
+    @Excel(name = "牛只编号")
+    private String cattleNo;
+
+    /** 疫病名称 */
+    @Excel(name = "疫病名称")
+    private String diseaseName;
+
+    /** 治疗人员 */
+    @Excel(name = "治疗人员")
+    private String treatPersonnel;
+
+    /** 资料方案 */
+    @Excel(name = "资料方案")
+    private String treatPlan;
+
+    /** 救治开始时间 */
+    @Excel(name = "救治开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 救治结束时间 */
+    @Excel(name = "救治结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 救治状态 */
+    @Excel(name = "救治状态")
+    private String treatStart;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setCattleNo(String cattleNo) 
+    {
+        this.cattleNo = cattleNo;
+    }
+
+    public String getCattleNo() 
+    {
+        return cattleNo;
+    }
+    public void setDiseaseName(String diseaseName) 
+    {
+        this.diseaseName = diseaseName;
+    }
+
+    public String getDiseaseName() 
+    {
+        return diseaseName;
+    }
+    public void setTreatPersonnel(String treatPersonnel) 
+    {
+        this.treatPersonnel = treatPersonnel;
+    }
+
+    public String getTreatPersonnel() 
+    {
+        return treatPersonnel;
+    }
+    public void setTreatPlan(String treatPlan) 
+    {
+        this.treatPlan = treatPlan;
+    }
+
+    public String getTreatPlan() 
+    {
+        return treatPlan;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setTreatStart(String treatStart) 
+    {
+        this.treatStart = treatStart;
+    }
+
+    public String getTreatStart() 
+    {
+        return treatStart;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("cattleNo", getCattleNo())
+            .append("diseaseName", getDiseaseName())
+            .append("treatPersonnel", getTreatPersonnel())
+            .append("treatPlan", getTreatPlan())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("treatStart", getTreatStart())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/diseaseArchives/mapper/SyglDiseaseArchivesMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.diseaseArchives.mapper;
+
+import java.util.List;
+import com.business.zhnc.diseaseArchives.domain.SyglDiseaseArchives;
+
+/**
+ * 疾病档案Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface SyglDiseaseArchivesMapper 
+{
+    /**
+     * 查询疾病档案
+     * 
+     * @param id 疾病档案ID
+     * @return 疾病档案
+     */
+    public SyglDiseaseArchives selectSyglDiseaseArchivesById(String id);
+
+    /**
+     * 查询疾病档案列表
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 疾病档案集合
+     */
+    public List<SyglDiseaseArchives> selectSyglDiseaseArchivesList(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 新增疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    public int insertSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 修改疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    public int updateSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 删除疾病档案
+     * 
+     * @param id 疾病档案ID
+     * @return 结果
+     */
+    public int deleteSyglDiseaseArchivesById(String id);
+
+    /**
+     * 批量删除疾病档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglDiseaseArchivesByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/diseaseArchives/service/ISyglDiseaseArchivesService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.diseaseArchives.service;
+
+import java.util.List;
+import com.business.zhnc.diseaseArchives.domain.SyglDiseaseArchives;
+
+/**
+ * 疾病档案Service接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface ISyglDiseaseArchivesService 
+{
+    /**
+     * 查询疾病档案
+     * 
+     * @param id 疾病档案ID
+     * @return 疾病档案
+     */
+    public SyglDiseaseArchives selectSyglDiseaseArchivesById(String id);
+
+    /**
+     * 查询疾病档案列表
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 疾病档案集合
+     */
+    public List<SyglDiseaseArchives> selectSyglDiseaseArchivesList(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 新增疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    public int insertSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 修改疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    public int updateSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives);
+
+    /**
+     * 批量删除疾病档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglDiseaseArchivesByIds(String ids);
+
+    /**
+     * 删除疾病档案信息
+     * 
+     * @param id 疾病档案ID
+     * @return 结果
+     */
+    public int deleteSyglDiseaseArchivesById(String id);
+}

+ 102 - 0
mybusiness/src/main/java/com/business/zhnc/diseaseArchives/service/impl/SyglDiseaseArchivesServiceImpl.java

@@ -0,0 +1,102 @@
+package com.business.zhnc.diseaseArchives.service.impl;
+
+import java.util.List;
+
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.diseaseArchives.mapper.SyglDiseaseArchivesMapper;
+import com.business.zhnc.diseaseArchives.domain.SyglDiseaseArchives;
+import com.business.zhnc.diseaseArchives.service.ISyglDiseaseArchivesService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 疾病档案Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Service
+public class SyglDiseaseArchivesServiceImpl implements ISyglDiseaseArchivesService 
+{
+    @Autowired
+    private SyglDiseaseArchivesMapper syglDiseaseArchivesMapper;
+
+    /**
+     * 查询疾病档案
+     * 
+     * @param id 疾病档案ID
+     * @return 疾病档案
+     */
+    @Override
+    public SyglDiseaseArchives selectSyglDiseaseArchivesById(String id)
+    {
+        return syglDiseaseArchivesMapper.selectSyglDiseaseArchivesById(id);
+    }
+
+    /**
+     * 查询疾病档案列表
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 疾病档案
+     */
+    @Override
+    public List<SyglDiseaseArchives> selectSyglDiseaseArchivesList(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        return syglDiseaseArchivesMapper.selectSyglDiseaseArchivesList(syglDiseaseArchives);
+    }
+
+    /**
+     * 新增疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    @Override
+    public int insertSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        syglDiseaseArchives.setId(ShiroUtils.uuid());
+        syglDiseaseArchives.setCreateTime(DateUtils.getNowDate());
+        syglDiseaseArchives.setCreateBy(ShiroUtils.getLoginName());
+        return syglDiseaseArchivesMapper.insertSyglDiseaseArchives(syglDiseaseArchives);
+    }
+
+    /**
+     * 修改疾病档案
+     * 
+     * @param syglDiseaseArchives 疾病档案
+     * @return 结果
+     */
+    @Override
+    public int updateSyglDiseaseArchives(SyglDiseaseArchives syglDiseaseArchives)
+    {
+        syglDiseaseArchives.setUpdateTime(DateUtils.getNowDate());
+        syglDiseaseArchives.setUpdateBy(ShiroUtils.getLoginName());
+        return syglDiseaseArchivesMapper.updateSyglDiseaseArchives(syglDiseaseArchives);
+    }
+
+    /**
+     * 删除疾病档案对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglDiseaseArchivesByIds(String ids)
+    {
+        return syglDiseaseArchivesMapper.deleteSyglDiseaseArchivesByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除疾病档案信息
+     * 
+     * @param id 疾病档案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglDiseaseArchivesById(String id)
+    {
+        return syglDiseaseArchivesMapper.deleteSyglDiseaseArchivesById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/drugsArchives/controller/SyglDrugsArchivesController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.drugsArchives.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.drugsArchives.domain.SyglDrugsArchives;
+import com.business.zhnc.drugsArchives.service.ISyglDrugsArchivesService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 药品档案Controller
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Controller
+@RequestMapping("/drugsArchives/archives")
+public class SyglDrugsArchivesController extends BaseController
+{
+    private String prefix = "drugsArchives/archives";
+
+    @Autowired
+    private ISyglDrugsArchivesService syglDrugsArchivesService;
+
+    @RequiresPermissions("drugsArchives:archives:view")
+    @GetMapping()
+    public String archives()
+    {
+        return prefix + "/archives";
+    }
+
+    /**
+     * 查询药品档案列表
+     */
+    @RequiresPermissions("drugsArchives:archives:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglDrugsArchives syglDrugsArchives)
+    {
+        startPage();
+        List<SyglDrugsArchives> list = syglDrugsArchivesService.selectSyglDrugsArchivesList(syglDrugsArchives);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出药品档案列表
+     */
+    @RequiresPermissions("drugsArchives:archives:export")
+    @Log(title = "药品档案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglDrugsArchives syglDrugsArchives)
+    {
+        List<SyglDrugsArchives> list = syglDrugsArchivesService.selectSyglDrugsArchivesList(syglDrugsArchives);
+        ExcelUtil<SyglDrugsArchives> util = new ExcelUtil<SyglDrugsArchives>(SyglDrugsArchives.class);
+        return util.exportExcel(list, "archives");
+    }
+
+    /**
+     * 新增药品档案
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存药品档案
+     */
+    @RequiresPermissions("drugsArchives:archives:add")
+    @Log(title = "药品档案", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglDrugsArchives syglDrugsArchives)
+    {
+        return toAjax(syglDrugsArchivesService.insertSyglDrugsArchives(syglDrugsArchives));
+    }
+
+    /**
+     * 修改药品档案
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglDrugsArchives syglDrugsArchives = syglDrugsArchivesService.selectSyglDrugsArchivesById(id);
+        mmap.put("syglDrugsArchives", syglDrugsArchives);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存药品档案
+     */
+    @RequiresPermissions("drugsArchives:archives:edit")
+    @Log(title = "药品档案", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglDrugsArchives syglDrugsArchives)
+    {
+        return toAjax(syglDrugsArchivesService.updateSyglDrugsArchives(syglDrugsArchives));
+    }
+
+    /**
+     * 删除药品档案
+     */
+    @RequiresPermissions("drugsArchives:archives:remove")
+    @Log(title = "药品档案", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglDrugsArchivesService.deleteSyglDrugsArchivesByIds(ids));
+    }
+}

+ 99 - 0
mybusiness/src/main/java/com/business/zhnc/drugsArchives/domain/SyglDrugsArchives.java

@@ -0,0 +1,99 @@
+package com.business.zhnc.drugsArchives.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 药品档案对象 sygl_drugs_archives
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public class SyglDrugsArchives extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 用药名称 */
+    @Excel(name = "用药名称")
+    private String drugsName;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String batch;
+
+    /** 人员 */
+    @Excel(name = "人员")
+    private String personnel;
+
+    /** 用药时间 */
+    @Excel(name = "用药时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date drugsTime;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setDrugsName(String drugsName) 
+    {
+        this.drugsName = drugsName;
+    }
+
+    public String getDrugsName() 
+    {
+        return drugsName;
+    }
+    public void setBatch(String batch) 
+    {
+        this.batch = batch;
+    }
+
+    public String getBatch() 
+    {
+        return batch;
+    }
+    public void setPersonnel(String personnel) 
+    {
+        this.personnel = personnel;
+    }
+
+    public String getPersonnel() 
+    {
+        return personnel;
+    }
+    public void setDrugsTime(Date drugsTime) 
+    {
+        this.drugsTime = drugsTime;
+    }
+
+    public Date getDrugsTime() 
+    {
+        return drugsTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("drugsName", getDrugsName())
+            .append("batch", getBatch())
+            .append("personnel", getPersonnel())
+            .append("drugsTime", getDrugsTime())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/drugsArchives/mapper/SyglDrugsArchivesMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.drugsArchives.mapper;
+
+import java.util.List;
+import com.business.zhnc.drugsArchives.domain.SyglDrugsArchives;
+
+/**
+ * 药品档案Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface SyglDrugsArchivesMapper 
+{
+    /**
+     * 查询药品档案
+     * 
+     * @param id 药品档案ID
+     * @return 药品档案
+     */
+    public SyglDrugsArchives selectSyglDrugsArchivesById(String id);
+
+    /**
+     * 查询药品档案列表
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 药品档案集合
+     */
+    public List<SyglDrugsArchives> selectSyglDrugsArchivesList(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 新增药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    public int insertSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 修改药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    public int updateSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 删除药品档案
+     * 
+     * @param id 药品档案ID
+     * @return 结果
+     */
+    public int deleteSyglDrugsArchivesById(String id);
+
+    /**
+     * 批量删除药品档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglDrugsArchivesByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/drugsArchives/service/ISyglDrugsArchivesService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.drugsArchives.service;
+
+import java.util.List;
+import com.business.zhnc.drugsArchives.domain.SyglDrugsArchives;
+
+/**
+ * 药品档案Service接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface ISyglDrugsArchivesService 
+{
+    /**
+     * 查询药品档案
+     * 
+     * @param id 药品档案ID
+     * @return 药品档案
+     */
+    public SyglDrugsArchives selectSyglDrugsArchivesById(String id);
+
+    /**
+     * 查询药品档案列表
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 药品档案集合
+     */
+    public List<SyglDrugsArchives> selectSyglDrugsArchivesList(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 新增药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    public int insertSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 修改药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    public int updateSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives);
+
+    /**
+     * 批量删除药品档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglDrugsArchivesByIds(String ids);
+
+    /**
+     * 删除药品档案信息
+     * 
+     * @param id 药品档案ID
+     * @return 结果
+     */
+    public int deleteSyglDrugsArchivesById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/drugsArchives/service/impl/SyglDrugsArchivesServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.drugsArchives.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.drugsArchives.mapper.SyglDrugsArchivesMapper;
+import com.business.zhnc.drugsArchives.domain.SyglDrugsArchives;
+import com.business.zhnc.drugsArchives.service.ISyglDrugsArchivesService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 药品档案Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Service
+public class SyglDrugsArchivesServiceImpl implements ISyglDrugsArchivesService 
+{
+    @Autowired
+    private SyglDrugsArchivesMapper syglDrugsArchivesMapper;
+
+    /**
+     * 查询药品档案
+     * 
+     * @param id 药品档案ID
+     * @return 药品档案
+     */
+    @Override
+    public SyglDrugsArchives selectSyglDrugsArchivesById(String id)
+    {
+        return syglDrugsArchivesMapper.selectSyglDrugsArchivesById(id);
+    }
+
+    /**
+     * 查询药品档案列表
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 药品档案
+     */
+    @Override
+    public List<SyglDrugsArchives> selectSyglDrugsArchivesList(SyglDrugsArchives syglDrugsArchives)
+    {
+        return syglDrugsArchivesMapper.selectSyglDrugsArchivesList(syglDrugsArchives);
+    }
+
+    /**
+     * 新增药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    @Override
+    public int insertSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives)
+    {
+        syglDrugsArchives.setId(ShiroUtils.uuid());
+        syglDrugsArchives.setCreateTime(DateUtils.getNowDate());
+        syglDrugsArchives.setCreateBy(ShiroUtils.getLoginName());
+        return syglDrugsArchivesMapper.insertSyglDrugsArchives(syglDrugsArchives);
+    }
+
+    /**
+     * 修改药品档案
+     * 
+     * @param syglDrugsArchives 药品档案
+     * @return 结果
+     */
+    @Override
+    public int updateSyglDrugsArchives(SyglDrugsArchives syglDrugsArchives)
+    {
+        syglDrugsArchives.setUpdateTime(DateUtils.getNowDate());
+        syglDrugsArchives.setUpdateBy(ShiroUtils.getLoginName());
+        return syglDrugsArchivesMapper.updateSyglDrugsArchives(syglDrugsArchives);
+    }
+
+    /**
+     * 删除药品档案对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglDrugsArchivesByIds(String ids)
+    {
+        return syglDrugsArchivesMapper.deleteSyglDrugsArchivesByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除药品档案信息
+     * 
+     * @param id 药品档案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglDrugsArchivesById(String id)
+    {
+        return syglDrugsArchivesMapper.deleteSyglDrugsArchivesById(id);
+    }
+}

+ 133 - 0
mybusiness/src/main/java/com/business/zhnc/fire/controller/YjglFireController.java

@@ -0,0 +1,133 @@
+package com.business.zhnc.fire.controller;
+
+import java.util.List;
+
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+import com.business.zhnc.cattleFarm.service.ISyglCattleFarmService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.fire.domain.YjglFire;
+import com.business.zhnc.fire.service.IYjglFireService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 火情Controller
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+@Controller
+@RequestMapping("/fire/fire")
+public class YjglFireController extends BaseController
+{
+    private String prefix = "fire/fire";
+
+    @Autowired
+    private IYjglFireService yjglFireService;
+    @Autowired
+    private ISyglCattleFarmService syglCattleFarmService;
+
+    @RequiresPermissions("fire:fire:view")
+    @GetMapping()
+    public String fire()
+    {
+        return prefix + "/fire";
+    }
+
+    /**
+     * 查询火情列表
+     */
+    @RequiresPermissions("fire:fire:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(YjglFire yjglFire)
+    {
+        startPage();
+        List<YjglFire> list = yjglFireService.selectYjglFireList(yjglFire);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出火情列表
+     */
+    @RequiresPermissions("fire:fire:export")
+    @Log(title = "火情", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(YjglFire yjglFire)
+    {
+        List<YjglFire> list = yjglFireService.selectYjglFireList(yjglFire);
+        ExcelUtil<YjglFire> util = new ExcelUtil<YjglFire>(YjglFire.class);
+        return util.exportExcel(list, "fire");
+    }
+
+    /**
+     * 新增火情
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存火情
+     */
+    @RequiresPermissions("fire:fire:add")
+    @Log(title = "火情", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(YjglFire yjglFire)
+    {
+        return toAjax(yjglFireService.insertYjglFire(yjglFire));
+    }
+
+    /**
+     * 修改火情
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        YjglFire yjglFire = yjglFireService.selectYjglFireById(id);
+        mmap.put("yjglFire", yjglFire);
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存火情
+     */
+    @RequiresPermissions("fire:fire:edit")
+    @Log(title = "火情", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(YjglFire yjglFire)
+    {
+        return toAjax(yjglFireService.updateYjglFire(yjglFire));
+    }
+
+    /**
+     * 删除火情
+     */
+    @RequiresPermissions("fire:fire:remove")
+    @Log(title = "火情", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(yjglFireService.deleteYjglFireByIds(ids));
+    }
+}

+ 94 - 0
mybusiness/src/main/java/com/business/zhnc/fire/domain/YjglFire.java

@@ -0,0 +1,94 @@
+package com.business.zhnc.fire.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 火情对象 yjgl_fire
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+public class YjglFire extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 火情大小 */
+    @Excel(name = "火情大小")
+    private String fireSize;
+
+    /** 是否扑灭 */
+    @Excel(name = "是否扑灭")
+    private String isPutout;
+
+    /** 牛场 */
+    private String cattleFarmId;
+
+    @Excel(name = "牛场")
+    private String cattleFarmName;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setFireSize(String fireSize)
+    {
+        this.fireSize = fireSize;
+    }
+
+    public String getFireSize()
+    {
+        return fireSize;
+    }
+    public void setIsPutout(String isPutout)
+    {
+        this.isPutout = isPutout;
+    }
+
+    public String getIsPutout()
+    {
+        return isPutout;
+    }
+    public void setCattleFarmId(String cattleFarmId)
+    {
+        this.cattleFarmId = cattleFarmId;
+    }
+
+    public String getCattleFarmId()
+    {
+        return cattleFarmId;
+    }
+
+    public String getCattleFarmName() {
+        return cattleFarmName;
+    }
+
+    public void setCattleFarmName(String cattleFarmName) {
+        this.cattleFarmName = cattleFarmName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fireSize", getFireSize())
+            .append("isPutout", getIsPutout())
+            .append("cattleFarmId", getCattleFarmId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/fire/mapper/YjglFireMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.fire.mapper;
+
+import java.util.List;
+import com.business.zhnc.fire.domain.YjglFire;
+
+/**
+ * 火情Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-26
+ */
+public interface YjglFireMapper 
+{
+    /**
+     * 查询火情
+     * 
+     * @param id 火情ID
+     * @return 火情
+     */
+    public YjglFire selectYjglFireById(String id);
+
+    /**
+     * 查询火情列表
+     * 
+     * @param yjglFire 火情
+     * @return 火情集合
+     */
+    public List<YjglFire> selectYjglFireList(YjglFire yjglFire);
+
+    /**
+     * 新增火情
+     * 
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    public int insertYjglFire(YjglFire yjglFire);
+
+    /**
+     * 修改火情
+     * 
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    public int updateYjglFire(YjglFire yjglFire);
+
+    /**
+     * 删除火情
+     * 
+     * @param id 火情ID
+     * @return 结果
+     */
+    public int deleteYjglFireById(String id);
+
+    /**
+     * 批量删除火情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYjglFireByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/fire/service/IYjglFireService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.fire.service;
+
+import java.util.List;
+import com.business.zhnc.fire.domain.YjglFire;
+
+/**
+ * 火情Service接口
+ * 
+ * @author lei
+ * @date 2022-05-26
+ */
+public interface IYjglFireService 
+{
+    /**
+     * 查询火情
+     * 
+     * @param id 火情ID
+     * @return 火情
+     */
+    public YjglFire selectYjglFireById(String id);
+
+    /**
+     * 查询火情列表
+     * 
+     * @param yjglFire 火情
+     * @return 火情集合
+     */
+    public List<YjglFire> selectYjglFireList(YjglFire yjglFire);
+
+    /**
+     * 新增火情
+     * 
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    public int insertYjglFire(YjglFire yjglFire);
+
+    /**
+     * 修改火情
+     * 
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    public int updateYjglFire(YjglFire yjglFire);
+
+    /**
+     * 批量删除火情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYjglFireByIds(String ids);
+
+    /**
+     * 删除火情信息
+     * 
+     * @param id 火情ID
+     * @return 结果
+     */
+    public int deleteYjglFireById(String id);
+}

+ 102 - 0
mybusiness/src/main/java/com/business/zhnc/fire/service/impl/YjglFireServiceImpl.java

@@ -0,0 +1,102 @@
+package com.business.zhnc.fire.service.impl;
+
+import com.business.zhnc.fire.domain.YjglFire;
+import com.business.zhnc.fire.mapper.YjglFireMapper;
+import com.business.zhnc.fire.service.IYjglFireService;
+import com.sooka.common.core.text.Convert;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 火情Service业务层处理
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+@Service
+public class YjglFireServiceImpl implements IYjglFireService
+{
+    @Autowired
+    private YjglFireMapper yjglFireMapper;
+
+    /**
+     * 查询火情
+     *
+     * @param id 火情ID
+     * @return 火情
+     */
+    @Override
+    public YjglFire selectYjglFireById(String id)
+    {
+        return yjglFireMapper.selectYjglFireById(id);
+    }
+
+    /**
+     * 查询火情列表
+     *
+     * @param yjglFire 火情
+     * @return 火情
+     */
+    @Override
+    public List<YjglFire> selectYjglFireList(YjglFire yjglFire)
+    {
+        return yjglFireMapper.selectYjglFireList(yjglFire);
+    }
+
+    /**
+     * 新增火情
+     *
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    @Override
+    public int insertYjglFire(YjglFire yjglFire)
+    {
+        yjglFire.setId(ShiroUtils.uuid());
+        yjglFire.setCreateTime(DateUtils.getNowDate());
+        yjglFire.setCreateBy(ShiroUtils.getLoginName());
+        return yjglFireMapper.insertYjglFire(yjglFire);
+    }
+
+    /**
+     * 修改火情
+     *
+     * @param yjglFire 火情
+     * @return 结果
+     */
+    @Override
+    public int updateYjglFire(YjglFire yjglFire)
+    {
+        yjglFire.setUpdateTime(DateUtils.getNowDate());
+        yjglFire.setUpdateBy(ShiroUtils.getLoginName());
+        return yjglFireMapper.updateYjglFire(yjglFire);
+    }
+
+    /**
+     * 删除火情对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYjglFireByIds(String ids)
+    {
+        return yjglFireMapper.deleteYjglFireByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除火情信息
+     *
+     * @param id 火情ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYjglFireById(String id)
+    {
+        return yjglFireMapper.deleteYjglFireById(id);
+    }
+}

+ 133 - 0
mybusiness/src/main/java/com/business/zhnc/intrusion/controller/YjglIntrusionController.java

@@ -0,0 +1,133 @@
+package com.business.zhnc.intrusion.controller;
+
+import java.util.List;
+
+import com.business.zhnc.cattleFarm.domain.SyglCattleFarm;
+import com.business.zhnc.cattleFarm.service.ISyglCattleFarmService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.intrusion.domain.YjglIntrusion;
+import com.business.zhnc.intrusion.service.IYjglIntrusionService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 入侵Controller
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+@Controller
+@RequestMapping("/intrusion/intrusion")
+public class YjglIntrusionController extends BaseController
+{
+    private String prefix = "intrusion/intrusion";
+
+    @Autowired
+    private IYjglIntrusionService yjglIntrusionService;
+    @Autowired
+    private ISyglCattleFarmService syglCattleFarmService;
+
+    @RequiresPermissions("intrusion:intrusion:view")
+    @GetMapping()
+    public String intrusion()
+    {
+        return prefix + "/intrusion";
+    }
+
+    /**
+     * 查询入侵列表
+     */
+    @RequiresPermissions("intrusion:intrusion:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(YjglIntrusion yjglIntrusion)
+    {
+        startPage();
+        List<YjglIntrusion> list = yjglIntrusionService.selectYjglIntrusionList(yjglIntrusion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入侵列表
+     */
+    @RequiresPermissions("intrusion:intrusion:export")
+    @Log(title = "入侵", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(YjglIntrusion yjglIntrusion)
+    {
+        List<YjglIntrusion> list = yjglIntrusionService.selectYjglIntrusionList(yjglIntrusion);
+        ExcelUtil<YjglIntrusion> util = new ExcelUtil<YjglIntrusion>(YjglIntrusion.class);
+        return util.exportExcel(list, "intrusion");
+    }
+
+    /**
+     * 新增入侵
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存入侵
+     */
+    @RequiresPermissions("intrusion:intrusion:add")
+    @Log(title = "入侵", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(YjglIntrusion yjglIntrusion)
+    {
+        return toAjax(yjglIntrusionService.insertYjglIntrusion(yjglIntrusion));
+    }
+
+    /**
+     * 修改入侵
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        YjglIntrusion yjglIntrusion = yjglIntrusionService.selectYjglIntrusionById(id);
+        mmap.put("yjglIntrusion", yjglIntrusion);
+        mmap.put("list",syglCattleFarmService.selectSyglCattleFarmList(new SyglCattleFarm()));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存入侵
+     */
+    @RequiresPermissions("intrusion:intrusion:edit")
+    @Log(title = "入侵", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(YjglIntrusion yjglIntrusion)
+    {
+        return toAjax(yjglIntrusionService.updateYjglIntrusion(yjglIntrusion));
+    }
+
+    /**
+     * 删除入侵
+     */
+    @RequiresPermissions("intrusion:intrusion:remove")
+    @Log(title = "入侵", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(yjglIntrusionService.deleteYjglIntrusionByIds(ids));
+    }
+}

+ 94 - 0
mybusiness/src/main/java/com/business/zhnc/intrusion/domain/YjglIntrusion.java

@@ -0,0 +1,94 @@
+package com.business.zhnc.intrusion.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 入侵对象 yjgl_intrusion
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+public class YjglIntrusion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 入侵类型 */
+    @Excel(name = "入侵类型")
+    private String intrusionType;
+
+    /** 是否已查看 */
+    @Excel(name = "是否已查看")
+    private String isSee;
+
+    /** 牛场id */
+    private String cattleFarmId;
+
+    @Excel(name = "牛场")
+    private String cattleFarmName;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setIntrusionType(String intrusionType)
+    {
+        this.intrusionType = intrusionType;
+    }
+
+    public String getIntrusionType()
+    {
+        return intrusionType;
+    }
+    public void setIsSee(String isSee)
+    {
+        this.isSee = isSee;
+    }
+
+    public String getIsSee()
+    {
+        return isSee;
+    }
+    public void setCattleFarmId(String cattleFarmId)
+    {
+        this.cattleFarmId = cattleFarmId;
+    }
+
+    public String getCattleFarmId()
+    {
+        return cattleFarmId;
+    }
+
+    public String getCattleFarmName() {
+        return cattleFarmName;
+    }
+
+    public void setCattleFarmName(String cattleFarmName) {
+        this.cattleFarmName = cattleFarmName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("intrusionType", getIntrusionType())
+            .append("isSee", getIsSee())
+            .append("cattleFarmId", getCattleFarmId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/intrusion/mapper/YjglIntrusionMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.intrusion.mapper;
+
+import java.util.List;
+import com.business.zhnc.intrusion.domain.YjglIntrusion;
+
+/**
+ * 入侵Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-26
+ */
+public interface YjglIntrusionMapper 
+{
+    /**
+     * 查询入侵
+     * 
+     * @param id 入侵ID
+     * @return 入侵
+     */
+    public YjglIntrusion selectYjglIntrusionById(String id);
+
+    /**
+     * 查询入侵列表
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 入侵集合
+     */
+    public List<YjglIntrusion> selectYjglIntrusionList(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 新增入侵
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    public int insertYjglIntrusion(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 修改入侵
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    public int updateYjglIntrusion(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 删除入侵
+     * 
+     * @param id 入侵ID
+     * @return 结果
+     */
+    public int deleteYjglIntrusionById(String id);
+
+    /**
+     * 批量删除入侵
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYjglIntrusionByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/intrusion/service/IYjglIntrusionService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.intrusion.service;
+
+import java.util.List;
+import com.business.zhnc.intrusion.domain.YjglIntrusion;
+
+/**
+ * 入侵Service接口
+ * 
+ * @author lei
+ * @date 2022-05-26
+ */
+public interface IYjglIntrusionService 
+{
+    /**
+     * 查询入侵
+     * 
+     * @param id 入侵ID
+     * @return 入侵
+     */
+    public YjglIntrusion selectYjglIntrusionById(String id);
+
+    /**
+     * 查询入侵列表
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 入侵集合
+     */
+    public List<YjglIntrusion> selectYjglIntrusionList(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 新增入侵
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    public int insertYjglIntrusion(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 修改入侵
+     * 
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    public int updateYjglIntrusion(YjglIntrusion yjglIntrusion);
+
+    /**
+     * 批量删除入侵
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYjglIntrusionByIds(String ids);
+
+    /**
+     * 删除入侵信息
+     * 
+     * @param id 入侵ID
+     * @return 结果
+     */
+    public int deleteYjglIntrusionById(String id);
+}

+ 102 - 0
mybusiness/src/main/java/com/business/zhnc/intrusion/service/impl/YjglIntrusionServiceImpl.java

@@ -0,0 +1,102 @@
+package com.business.zhnc.intrusion.service.impl;
+
+import com.business.zhnc.intrusion.domain.YjglIntrusion;
+import com.business.zhnc.intrusion.mapper.YjglIntrusionMapper;
+import com.business.zhnc.intrusion.service.IYjglIntrusionService;
+import com.sooka.common.core.text.Convert;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 入侵Service业务层处理
+ *
+ * @author lei
+ * @date 2022-05-26
+ */
+@Service
+public class YjglIntrusionServiceImpl implements IYjglIntrusionService
+{
+    @Autowired
+    private YjglIntrusionMapper yjglIntrusionMapper;
+
+    /**
+     * 查询入侵
+     *
+     * @param id 入侵ID
+     * @return 入侵
+     */
+    @Override
+    public YjglIntrusion selectYjglIntrusionById(String id)
+    {
+        return yjglIntrusionMapper.selectYjglIntrusionById(id);
+    }
+
+    /**
+     * 查询入侵列表
+     *
+     * @param yjglIntrusion 入侵
+     * @return 入侵
+     */
+    @Override
+    public List<YjglIntrusion> selectYjglIntrusionList(YjglIntrusion yjglIntrusion)
+    {
+        return yjglIntrusionMapper.selectYjglIntrusionList(yjglIntrusion);
+    }
+
+    /**
+     * 新增入侵
+     *
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    @Override
+    public int insertYjglIntrusion(YjglIntrusion yjglIntrusion)
+    {
+        yjglIntrusion.setId(ShiroUtils.uuid());
+        yjglIntrusion.setCreateTime(DateUtils.getNowDate());
+        yjglIntrusion.setCreateBy(ShiroUtils.getLoginName());
+        return yjglIntrusionMapper.insertYjglIntrusion(yjglIntrusion);
+    }
+
+    /**
+     * 修改入侵
+     *
+     * @param yjglIntrusion 入侵
+     * @return 结果
+     */
+    @Override
+    public int updateYjglIntrusion(YjglIntrusion yjglIntrusion)
+    {
+        yjglIntrusion.setUpdateTime(DateUtils.getNowDate());
+        yjglIntrusion.setUpdateBy(ShiroUtils.getLoginName());
+        return yjglIntrusionMapper.updateYjglIntrusion(yjglIntrusion);
+    }
+
+    /**
+     * 删除入侵对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYjglIntrusionByIds(String ids)
+    {
+        return yjglIntrusionMapper.deleteYjglIntrusionByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除入侵信息
+     *
+     * @param id 入侵ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYjglIntrusionById(String id)
+    {
+        return yjglIntrusionMapper.deleteYjglIntrusionById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/machiningArchives/controller/SyglMachiningArchivesController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.machiningArchives.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.machiningArchives.domain.SyglMachiningArchives;
+import com.business.zhnc.machiningArchives.service.ISyglMachiningArchivesService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 加工档案Controller
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Controller
+@RequestMapping("/machiningArchives/archives")
+public class SyglMachiningArchivesController extends BaseController
+{
+    private String prefix = "machiningArchives/archives";
+
+    @Autowired
+    private ISyglMachiningArchivesService syglMachiningArchivesService;
+
+    @RequiresPermissions("machiningArchives:archives:view")
+    @GetMapping()
+    public String archives()
+    {
+        return prefix + "/archives";
+    }
+
+    /**
+     * 查询加工档案列表
+     */
+    @RequiresPermissions("machiningArchives:archives:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglMachiningArchives syglMachiningArchives)
+    {
+        startPage();
+        List<SyglMachiningArchives> list = syglMachiningArchivesService.selectSyglMachiningArchivesList(syglMachiningArchives);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出加工档案列表
+     */
+    @RequiresPermissions("machiningArchives:archives:export")
+    @Log(title = "加工档案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglMachiningArchives syglMachiningArchives)
+    {
+        List<SyglMachiningArchives> list = syglMachiningArchivesService.selectSyglMachiningArchivesList(syglMachiningArchives);
+        ExcelUtil<SyglMachiningArchives> util = new ExcelUtil<SyglMachiningArchives>(SyglMachiningArchives.class);
+        return util.exportExcel(list, "archives");
+    }
+
+    /**
+     * 新增加工档案
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存加工档案
+     */
+    @RequiresPermissions("machiningArchives:archives:add")
+    @Log(title = "加工档案", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglMachiningArchives syglMachiningArchives)
+    {
+        return toAjax(syglMachiningArchivesService.insertSyglMachiningArchives(syglMachiningArchives));
+    }
+
+    /**
+     * 修改加工档案
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglMachiningArchives syglMachiningArchives = syglMachiningArchivesService.selectSyglMachiningArchivesById(id);
+        mmap.put("syglMachiningArchives", syglMachiningArchives);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存加工档案
+     */
+    @RequiresPermissions("machiningArchives:archives:edit")
+    @Log(title = "加工档案", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglMachiningArchives syglMachiningArchives)
+    {
+        return toAjax(syglMachiningArchivesService.updateSyglMachiningArchives(syglMachiningArchives));
+    }
+
+    /**
+     * 删除加工档案
+     */
+    @RequiresPermissions("machiningArchives:archives:remove")
+    @Log(title = "加工档案", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglMachiningArchivesService.deleteSyglMachiningArchivesByIds(ids));
+    }
+}

+ 127 - 0
mybusiness/src/main/java/com/business/zhnc/machiningArchives/domain/SyglMachiningArchives.java

@@ -0,0 +1,127 @@
+package com.business.zhnc.machiningArchives.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 加工档案对象 sygl_machining_archives
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public class SyglMachiningArchives extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 加工车间 */
+    @Excel(name = "加工车间")
+    private String processingWorkshop;
+
+    /** 操作人 */
+    @Excel(name = "操作人")
+    private String operator;
+
+    /** 包装人员 */
+    @Excel(name = "包装人员")
+    private String packagingPersonnel;
+
+    /** 产品 */
+    @Excel(name = "产品")
+    private String product;
+
+    /** 等级 */
+    @Excel(name = "等级")
+    private String grade;
+
+    /** 加工时间 */
+    @Excel(name = "加工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date processingTime;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProcessingWorkshop(String processingWorkshop) 
+    {
+        this.processingWorkshop = processingWorkshop;
+    }
+
+    public String getProcessingWorkshop() 
+    {
+        return processingWorkshop;
+    }
+    public void setOperator(String operator) 
+    {
+        this.operator = operator;
+    }
+
+    public String getOperator() 
+    {
+        return operator;
+    }
+    public void setPackagingPersonnel(String packagingPersonnel) 
+    {
+        this.packagingPersonnel = packagingPersonnel;
+    }
+
+    public String getPackagingPersonnel() 
+    {
+        return packagingPersonnel;
+    }
+    public void setProduct(String product) 
+    {
+        this.product = product;
+    }
+
+    public String getProduct() 
+    {
+        return product;
+    }
+    public void setGrade(String grade) 
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade() 
+    {
+        return grade;
+    }
+    public void setProcessingTime(Date processingTime) 
+    {
+        this.processingTime = processingTime;
+    }
+
+    public Date getProcessingTime() 
+    {
+        return processingTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("processingWorkshop", getProcessingWorkshop())
+            .append("operator", getOperator())
+            .append("packagingPersonnel", getPackagingPersonnel())
+            .append("product", getProduct())
+            .append("grade", getGrade())
+            .append("processingTime", getProcessingTime())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/machiningArchives/mapper/SyglMachiningArchivesMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.machiningArchives.mapper;
+
+import java.util.List;
+import com.business.zhnc.machiningArchives.domain.SyglMachiningArchives;
+
+/**
+ * 加工档案Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface SyglMachiningArchivesMapper 
+{
+    /**
+     * 查询加工档案
+     * 
+     * @param id 加工档案ID
+     * @return 加工档案
+     */
+    public SyglMachiningArchives selectSyglMachiningArchivesById(String id);
+
+    /**
+     * 查询加工档案列表
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 加工档案集合
+     */
+    public List<SyglMachiningArchives> selectSyglMachiningArchivesList(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 新增加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    public int insertSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 修改加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    public int updateSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 删除加工档案
+     * 
+     * @param id 加工档案ID
+     * @return 结果
+     */
+    public int deleteSyglMachiningArchivesById(String id);
+
+    /**
+     * 批量删除加工档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglMachiningArchivesByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/machiningArchives/service/ISyglMachiningArchivesService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.machiningArchives.service;
+
+import java.util.List;
+import com.business.zhnc.machiningArchives.domain.SyglMachiningArchives;
+
+/**
+ * 加工档案Service接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface ISyglMachiningArchivesService 
+{
+    /**
+     * 查询加工档案
+     * 
+     * @param id 加工档案ID
+     * @return 加工档案
+     */
+    public SyglMachiningArchives selectSyglMachiningArchivesById(String id);
+
+    /**
+     * 查询加工档案列表
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 加工档案集合
+     */
+    public List<SyglMachiningArchives> selectSyglMachiningArchivesList(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 新增加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    public int insertSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 修改加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    public int updateSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives);
+
+    /**
+     * 批量删除加工档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglMachiningArchivesByIds(String ids);
+
+    /**
+     * 删除加工档案信息
+     * 
+     * @param id 加工档案ID
+     * @return 结果
+     */
+    public int deleteSyglMachiningArchivesById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/machiningArchives/service/impl/SyglMachiningArchivesServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.machiningArchives.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.machiningArchives.mapper.SyglMachiningArchivesMapper;
+import com.business.zhnc.machiningArchives.domain.SyglMachiningArchives;
+import com.business.zhnc.machiningArchives.service.ISyglMachiningArchivesService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 加工档案Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Service
+public class SyglMachiningArchivesServiceImpl implements ISyglMachiningArchivesService 
+{
+    @Autowired
+    private SyglMachiningArchivesMapper syglMachiningArchivesMapper;
+
+    /**
+     * 查询加工档案
+     * 
+     * @param id 加工档案ID
+     * @return 加工档案
+     */
+    @Override
+    public SyglMachiningArchives selectSyglMachiningArchivesById(String id)
+    {
+        return syglMachiningArchivesMapper.selectSyglMachiningArchivesById(id);
+    }
+
+    /**
+     * 查询加工档案列表
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 加工档案
+     */
+    @Override
+    public List<SyglMachiningArchives> selectSyglMachiningArchivesList(SyglMachiningArchives syglMachiningArchives)
+    {
+        return syglMachiningArchivesMapper.selectSyglMachiningArchivesList(syglMachiningArchives);
+    }
+
+    /**
+     * 新增加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    @Override
+    public int insertSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives)
+    {
+        syglMachiningArchives.setId(ShiroUtils.uuid());
+        syglMachiningArchives.setCreateTime(DateUtils.getNowDate());
+        syglMachiningArchives.setCreateBy(ShiroUtils.getLoginName());
+        return syglMachiningArchivesMapper.insertSyglMachiningArchives(syglMachiningArchives);
+    }
+
+    /**
+     * 修改加工档案
+     * 
+     * @param syglMachiningArchives 加工档案
+     * @return 结果
+     */
+    @Override
+    public int updateSyglMachiningArchives(SyglMachiningArchives syglMachiningArchives)
+    {
+        syglMachiningArchives.setUpdateTime(DateUtils.getNowDate());
+        syglMachiningArchives.setUpdateBy(ShiroUtils.getLoginName());
+        return syglMachiningArchivesMapper.updateSyglMachiningArchives(syglMachiningArchives);
+    }
+
+    /**
+     * 删除加工档案对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglMachiningArchivesByIds(String ids)
+    {
+        return syglMachiningArchivesMapper.deleteSyglMachiningArchivesByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除加工档案信息
+     * 
+     * @param id 加工档案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglMachiningArchivesById(String id)
+    {
+        return syglMachiningArchivesMapper.deleteSyglMachiningArchivesById(id);
+    }
+}

+ 29 - 0
mybusiness/src/main/java/com/business/zhnc/phone/controller/PhoneController.java

@@ -0,0 +1,29 @@
+package com.business.zhnc.phone.controller;
+
+import com.sooka.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 大数据Controller
+ * @author wang_xy
+ * @description
+ * @Version 1.0
+ * @params
+ * @return
+ * @since 2022/5/10 15:04
+ */
+@Controller
+@RequestMapping("/phoneHtml")
+public class PhoneController extends BaseController
+{
+    private String prefix = "phoneHtml";
+
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/index";
+    }
+
+}

+ 129 - 0
mybusiness/src/main/java/com/business/zhnc/residentUser/controller/YyglResidentUserController.java

@@ -0,0 +1,129 @@
+package com.business.zhnc.residentUser.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import com.sooka.framework.util.ShiroUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.residentUser.domain.YyglResidentUser;
+import com.business.zhnc.residentUser.service.IYyglResidentUserService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 入住用户Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/residentUser/user")
+public class YyglResidentUserController extends BaseController
+{
+    private String prefix = "residentUser/user";
+
+    @Autowired
+    private IYyglResidentUserService yyglResidentUserService;
+
+    @RequiresPermissions("residentUser:user:view")
+    @GetMapping()
+    public String user()
+    {
+        return prefix + "/user";
+    }
+
+    /**
+     * 查询入住用户列表
+     */
+    @RequiresPermissions("residentUser:user:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(YyglResidentUser yyglResidentUser)
+    {
+        startPage();
+        List<YyglResidentUser> list = yyglResidentUserService.selectYyglResidentUserList(yyglResidentUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入住用户列表
+     */
+    @RequiresPermissions("residentUser:user:export")
+    @Log(title = "入住用户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(YyglResidentUser yyglResidentUser)
+    {
+        List<YyglResidentUser> list = yyglResidentUserService.selectYyglResidentUserList(yyglResidentUser);
+        ExcelUtil<YyglResidentUser> util = new ExcelUtil<YyglResidentUser>(YyglResidentUser.class);
+        return util.exportExcel(list, "user");
+    }
+
+    /**
+     * 新增入住用户
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存入住用户
+     */
+    @RequiresPermissions("residentUser:user:add")
+    @Log(title = "入住用户", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(YyglResidentUser yyglResidentUser)
+    {
+        return toAjax(yyglResidentUserService.insertYyglResidentUser(yyglResidentUser));
+    }
+
+    /**
+     * 修改入住用户
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        YyglResidentUser yyglResidentUser = yyglResidentUserService.selectYyglResidentUserById(id);
+        mmap.put("yyglResidentUser", yyglResidentUser);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存入住用户
+     */
+    @RequiresPermissions("residentUser:user:edit")
+    @Log(title = "入住用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(YyglResidentUser yyglResidentUser)
+    {
+        return toAjax(yyglResidentUserService.updateYyglResidentUser(yyglResidentUser));
+    }
+
+    /**
+     * 删除入住用户
+     */
+    @RequiresPermissions("residentUser:user:remove")
+    @Log(title = "入住用户", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(yyglResidentUserService.deleteYyglResidentUserByIds(ids));
+    }
+}

+ 220 - 0
mybusiness/src/main/java/com/business/zhnc/residentUser/domain/YyglResidentUser.java

@@ -0,0 +1,220 @@
+package com.business.zhnc.residentUser.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 入住用户对象 yygl_resident_user
+ *
+ * @author lei
+ * @date 2022-05-04
+ */
+public class YyglResidentUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 入住人姓名 */
+    @Excel(name = "入住人姓名")
+    private String name;
+
+    /** 入住类型(个体、团体、企业、农户) */
+    @Excel(name = "入住类型", readConverterExp = "个=体、团体、企业、农户")
+    private String type;
+
+    /** 所在地 */
+    @Excel(name = "所在地")
+    private String location;
+
+    /** 合同年限 */
+    @Excel(name = "合同年限")
+    private String contractYear;
+
+    /** 是否是农户 */
+    @Excel(name = "是否是农户")
+    private String isPeasant;
+
+    /** 是否有贷款 */
+    @Excel(name = "是否有贷款")
+    private String isLoan;
+
+    /** 入住规模(多少头牛、多少成本) */
+    @Excel(name = "入住规模", readConverterExp = "多=少头牛、多少成本")
+    private String occupancyScale;
+
+    /** 保险保单 */
+    @Excel(name = "保险保单")
+    private String insurancePolicy;
+
+    /** 合同 */
+    @Excel(name = "合同")
+    private String contract;
+
+    /** 贷款数额 */
+    @Excel(name = "贷款数额")
+    private String loanNum;
+
+    /** 投资费用 */
+    @Excel(name = "投资费用")
+    private String investmentCost;
+
+    /** 入住牛只数量 */
+    @Excel(name = "入住牛只数量")
+    private String cattleNum;
+
+    /** 保单图片 */
+    private String insurancePolicyPath;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public void setLocation(String location)
+    {
+        this.location = location;
+    }
+
+    public String getLocation()
+    {
+        return location;
+    }
+    public void setContractYear(String contractYear)
+    {
+        this.contractYear = contractYear;
+    }
+
+    public String getContractYear()
+    {
+        return contractYear;
+    }
+    public void setIsPeasant(String isPeasant)
+    {
+        this.isPeasant = isPeasant;
+    }
+
+    public String getIsPeasant()
+    {
+        return isPeasant;
+    }
+    public void setIsLoan(String isLoan)
+    {
+        this.isLoan = isLoan;
+    }
+
+    public String getIsLoan()
+    {
+        return isLoan;
+    }
+    public void setOccupancyScale(String occupancyScale)
+    {
+        this.occupancyScale = occupancyScale;
+    }
+
+    public String getOccupancyScale()
+    {
+        return occupancyScale;
+    }
+    public void setInsurancePolicy(String insurancePolicy)
+    {
+        this.insurancePolicy = insurancePolicy;
+    }
+
+    public String getInsurancePolicy()
+    {
+        return insurancePolicy;
+    }
+    public void setContract(String contract)
+    {
+        this.contract = contract;
+    }
+
+    public String getContract()
+    {
+        return contract;
+    }
+    public void setLoanNum(String loanNum)
+    {
+        this.loanNum = loanNum;
+    }
+
+    public String getLoanNum()
+    {
+        return loanNum;
+    }
+
+    public String getInvestmentCost() {
+        return investmentCost;
+    }
+
+    public void setInvestmentCost(String investmentCost) {
+        this.investmentCost = investmentCost;
+    }
+
+    public String getCattleNum() {
+        return cattleNum;
+    }
+
+    public void setCattleNum(String cattleNum) {
+        this.cattleNum = cattleNum;
+    }
+
+    public String getInsurancePolicyPath() {
+        return insurancePolicyPath;
+    }
+
+    public void setInsurancePolicyPath(String insurancePolicyPath) {
+        this.insurancePolicyPath = insurancePolicyPath;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("location", getLocation())
+            .append("contractYear", getContractYear())
+            .append("isPeasant", getIsPeasant())
+            .append("isLoan", getIsLoan())
+            .append("occupancyScale", getOccupancyScale())
+            .append("insurancePolicy", getInsurancePolicy())
+            .append("contract", getContract())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .append("loanNum", getLoanNum())
+            .append("investmentCost", getInvestmentCost())
+            .append("cattleNum", getCattleNum())
+            .append("insurancePolicyPath", getInsurancePolicyPath())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/residentUser/mapper/YyglResidentUserMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.residentUser.mapper;
+
+import java.util.List;
+import com.business.zhnc.residentUser.domain.YyglResidentUser;
+
+/**
+ * 入住用户Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface YyglResidentUserMapper 
+{
+    /**
+     * 查询入住用户
+     * 
+     * @param id 入住用户ID
+     * @return 入住用户
+     */
+    public YyglResidentUser selectYyglResidentUserById(String id);
+
+    /**
+     * 查询入住用户列表
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 入住用户集合
+     */
+    public List<YyglResidentUser> selectYyglResidentUserList(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 新增入住用户
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    public int insertYyglResidentUser(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 修改入住用户
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    public int updateYyglResidentUser(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 删除入住用户
+     * 
+     * @param id 入住用户ID
+     * @return 结果
+     */
+    public int deleteYyglResidentUserById(String id);
+
+    /**
+     * 批量删除入住用户
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYyglResidentUserByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/residentUser/service/IYyglResidentUserService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.residentUser.service;
+
+import java.util.List;
+import com.business.zhnc.residentUser.domain.YyglResidentUser;
+
+/**
+ * 入住用户Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface IYyglResidentUserService 
+{
+    /**
+     * 查询入住用户
+     * 
+     * @param id 入住用户ID
+     * @return 入住用户
+     */
+    public YyglResidentUser selectYyglResidentUserById(String id);
+
+    /**
+     * 查询入住用户列表
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 入住用户集合
+     */
+    public List<YyglResidentUser> selectYyglResidentUserList(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 新增入住用户
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    public int insertYyglResidentUser(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 修改入住用户
+     * 
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    public int updateYyglResidentUser(YyglResidentUser yyglResidentUser);
+
+    /**
+     * 批量删除入住用户
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteYyglResidentUserByIds(String ids);
+
+    /**
+     * 删除入住用户信息
+     * 
+     * @param id 入住用户ID
+     * @return 结果
+     */
+    public int deleteYyglResidentUserById(String id);
+}

+ 110 - 0
mybusiness/src/main/java/com/business/zhnc/residentUser/service/impl/YyglResidentUserServiceImpl.java

@@ -0,0 +1,110 @@
+package com.business.zhnc.residentUser.service.impl;
+
+import java.util.List;
+
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.residentUser.mapper.YyglResidentUserMapper;
+import com.business.zhnc.residentUser.domain.YyglResidentUser;
+import com.business.zhnc.residentUser.service.IYyglResidentUserService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 入住用户Service业务层处理
+ *
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class YyglResidentUserServiceImpl implements IYyglResidentUserService
+{
+    @Autowired
+    private YyglResidentUserMapper yyglResidentUserMapper;
+
+    /**
+     * 查询入住用户
+     *
+     * @param id 入住用户ID
+     * @return 入住用户
+     */
+    @Override
+    public YyglResidentUser selectYyglResidentUserById(String id)
+    {
+        return yyglResidentUserMapper.selectYyglResidentUserById(id);
+    }
+
+    /**
+     * 查询入住用户列表
+     *
+     * @param yyglResidentUser 入住用户
+     * @return 入住用户
+     */
+    @Override
+    public List<YyglResidentUser> selectYyglResidentUserList(YyglResidentUser yyglResidentUser)
+    {
+        return yyglResidentUserMapper.selectYyglResidentUserList(yyglResidentUser);
+    }
+
+    /**
+     * 新增入住用户
+     *
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    @Override
+    public int insertYyglResidentUser(YyglResidentUser yyglResidentUser)
+    {
+        yyglResidentUser.setId(ShiroUtils.uuid());
+        yyglResidentUser.setCreateTime(DateUtils.getNowDate());
+        yyglResidentUser.setCreateBy(ShiroUtils.getLoginName());
+        String fileObject = yyglResidentUser.getInsurancePolicyPath();
+        if(fileObject!=null&&!"".equals(fileObject)){
+            int index = fileObject.lastIndexOf(",")+1;
+            if(index==fileObject.length()){
+                String newFileObject=fileObject.substring(0,fileObject.length()-1);
+                yyglResidentUser.setInsurancePolicyPath(newFileObject);
+            }
+        }
+        return yyglResidentUserMapper.insertYyglResidentUser(yyglResidentUser);
+    }
+
+    /**
+     * 修改入住用户
+     *
+     * @param yyglResidentUser 入住用户
+     * @return 结果
+     */
+    @Override
+    public int updateYyglResidentUser(YyglResidentUser yyglResidentUser)
+    {
+        yyglResidentUser.setUpdateTime(DateUtils.getNowDate());
+        yyglResidentUser.setUpdateBy(ShiroUtils.getLoginName());
+        return yyglResidentUserMapper.updateYyglResidentUser(yyglResidentUser);
+    }
+
+    /**
+     * 删除入住用户对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYyglResidentUserByIds(String ids)
+    {
+        return yyglResidentUserMapper.deleteYyglResidentUserByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除入住用户信息
+     *
+     * @param id 入住用户ID
+     * @return 结果
+     */
+    @Override
+    public int deleteYyglResidentUserById(String id)
+    {
+        return yyglResidentUserMapper.deleteYyglResidentUserById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/salesArchives/controller/SyglSalesArchivesController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.salesArchives.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.salesArchives.domain.SyglSalesArchives;
+import com.business.zhnc.salesArchives.service.ISyglSalesArchivesService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 销售档案Controller
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Controller
+@RequestMapping("/salesArchives/archives")
+public class SyglSalesArchivesController extends BaseController
+{
+    private String prefix = "salesArchives/archives";
+
+    @Autowired
+    private ISyglSalesArchivesService syglSalesArchivesService;
+
+    @RequiresPermissions("salesArchives:archives:view")
+    @GetMapping()
+    public String archives()
+    {
+        return prefix + "/archives";
+    }
+
+    /**
+     * 查询销售档案列表
+     */
+    @RequiresPermissions("salesArchives:archives:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglSalesArchives syglSalesArchives)
+    {
+        startPage();
+        List<SyglSalesArchives> list = syglSalesArchivesService.selectSyglSalesArchivesList(syglSalesArchives);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出销售档案列表
+     */
+    @RequiresPermissions("salesArchives:archives:export")
+    @Log(title = "销售档案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglSalesArchives syglSalesArchives)
+    {
+        List<SyglSalesArchives> list = syglSalesArchivesService.selectSyglSalesArchivesList(syglSalesArchives);
+        ExcelUtil<SyglSalesArchives> util = new ExcelUtil<SyglSalesArchives>(SyglSalesArchives.class);
+        return util.exportExcel(list, "archives");
+    }
+
+    /**
+     * 新增销售档案
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存销售档案
+     */
+    @RequiresPermissions("salesArchives:archives:add")
+    @Log(title = "销售档案", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglSalesArchives syglSalesArchives)
+    {
+        return toAjax(syglSalesArchivesService.insertSyglSalesArchives(syglSalesArchives));
+    }
+
+    /**
+     * 修改销售档案
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglSalesArchives syglSalesArchives = syglSalesArchivesService.selectSyglSalesArchivesById(id);
+        mmap.put("syglSalesArchives", syglSalesArchives);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存销售档案
+     */
+    @RequiresPermissions("salesArchives:archives:edit")
+    @Log(title = "销售档案", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglSalesArchives syglSalesArchives)
+    {
+        return toAjax(syglSalesArchivesService.updateSyglSalesArchives(syglSalesArchives));
+    }
+
+    /**
+     * 删除销售档案
+     */
+    @RequiresPermissions("salesArchives:archives:remove")
+    @Log(title = "销售档案", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglSalesArchivesService.deleteSyglSalesArchivesByIds(ids));
+    }
+}

+ 127 - 0
mybusiness/src/main/java/com/business/zhnc/salesArchives/domain/SyglSalesArchives.java

@@ -0,0 +1,127 @@
+package com.business.zhnc.salesArchives.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 销售档案对象 sygl_sales_archives
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public class SyglSalesArchives extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String batch;
+
+    /** 销售线路 */
+    @Excel(name = "销售线路")
+    private String salesLine;
+
+    /** 销售金额 */
+    @Excel(name = "销售金额")
+    private String salesAmount;
+
+    /** 出货时间 */
+    @Excel(name = "出货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shippingTime;
+
+    /** 出货人员 */
+    @Excel(name = "出货人员")
+    private String shippingPersonnel;
+
+    /** 装载人员 */
+    @Excel(name = "装载人员")
+    private String loader;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setBatch(String batch) 
+    {
+        this.batch = batch;
+    }
+
+    public String getBatch() 
+    {
+        return batch;
+    }
+    public void setSalesLine(String salesLine) 
+    {
+        this.salesLine = salesLine;
+    }
+
+    public String getSalesLine() 
+    {
+        return salesLine;
+    }
+    public void setSalesAmount(String salesAmount) 
+    {
+        this.salesAmount = salesAmount;
+    }
+
+    public String getSalesAmount() 
+    {
+        return salesAmount;
+    }
+    public void setShippingTime(Date shippingTime) 
+    {
+        this.shippingTime = shippingTime;
+    }
+
+    public Date getShippingTime() 
+    {
+        return shippingTime;
+    }
+    public void setShippingPersonnel(String shippingPersonnel) 
+    {
+        this.shippingPersonnel = shippingPersonnel;
+    }
+
+    public String getShippingPersonnel() 
+    {
+        return shippingPersonnel;
+    }
+    public void setLoader(String loader) 
+    {
+        this.loader = loader;
+    }
+
+    public String getLoader() 
+    {
+        return loader;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("batch", getBatch())
+            .append("salesLine", getSalesLine())
+            .append("salesAmount", getSalesAmount())
+            .append("shippingTime", getShippingTime())
+            .append("shippingPersonnel", getShippingPersonnel())
+            .append("loader", getLoader())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/salesArchives/mapper/SyglSalesArchivesMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.salesArchives.mapper;
+
+import java.util.List;
+import com.business.zhnc.salesArchives.domain.SyglSalesArchives;
+
+/**
+ * 销售档案Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface SyglSalesArchivesMapper 
+{
+    /**
+     * 查询销售档案
+     * 
+     * @param id 销售档案ID
+     * @return 销售档案
+     */
+    public SyglSalesArchives selectSyglSalesArchivesById(String id);
+
+    /**
+     * 查询销售档案列表
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 销售档案集合
+     */
+    public List<SyglSalesArchives> selectSyglSalesArchivesList(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 新增销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    public int insertSyglSalesArchives(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 修改销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    public int updateSyglSalesArchives(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 删除销售档案
+     * 
+     * @param id 销售档案ID
+     * @return 结果
+     */
+    public int deleteSyglSalesArchivesById(String id);
+
+    /**
+     * 批量删除销售档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglSalesArchivesByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/salesArchives/service/ISyglSalesArchivesService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.salesArchives.service;
+
+import java.util.List;
+import com.business.zhnc.salesArchives.domain.SyglSalesArchives;
+
+/**
+ * 销售档案Service接口
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+public interface ISyglSalesArchivesService 
+{
+    /**
+     * 查询销售档案
+     * 
+     * @param id 销售档案ID
+     * @return 销售档案
+     */
+    public SyglSalesArchives selectSyglSalesArchivesById(String id);
+
+    /**
+     * 查询销售档案列表
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 销售档案集合
+     */
+    public List<SyglSalesArchives> selectSyglSalesArchivesList(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 新增销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    public int insertSyglSalesArchives(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 修改销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    public int updateSyglSalesArchives(SyglSalesArchives syglSalesArchives);
+
+    /**
+     * 批量删除销售档案
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglSalesArchivesByIds(String ids);
+
+    /**
+     * 删除销售档案信息
+     * 
+     * @param id 销售档案ID
+     * @return 结果
+     */
+    public int deleteSyglSalesArchivesById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/salesArchives/service/impl/SyglSalesArchivesServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.salesArchives.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.salesArchives.mapper.SyglSalesArchivesMapper;
+import com.business.zhnc.salesArchives.domain.SyglSalesArchives;
+import com.business.zhnc.salesArchives.service.ISyglSalesArchivesService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 销售档案Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-05
+ */
+@Service
+public class SyglSalesArchivesServiceImpl implements ISyglSalesArchivesService 
+{
+    @Autowired
+    private SyglSalesArchivesMapper syglSalesArchivesMapper;
+
+    /**
+     * 查询销售档案
+     * 
+     * @param id 销售档案ID
+     * @return 销售档案
+     */
+    @Override
+    public SyglSalesArchives selectSyglSalesArchivesById(String id)
+    {
+        return syglSalesArchivesMapper.selectSyglSalesArchivesById(id);
+    }
+
+    /**
+     * 查询销售档案列表
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 销售档案
+     */
+    @Override
+    public List<SyglSalesArchives> selectSyglSalesArchivesList(SyglSalesArchives syglSalesArchives)
+    {
+        return syglSalesArchivesMapper.selectSyglSalesArchivesList(syglSalesArchives);
+    }
+
+    /**
+     * 新增销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    @Override
+    public int insertSyglSalesArchives(SyglSalesArchives syglSalesArchives)
+    {
+        syglSalesArchives.setId(ShiroUtils.uuid());
+        syglSalesArchives.setCreateTime(DateUtils.getNowDate());
+        syglSalesArchives.setCreateBy(ShiroUtils.getLoginName());
+        return syglSalesArchivesMapper.insertSyglSalesArchives(syglSalesArchives);
+    }
+
+    /**
+     * 修改销售档案
+     * 
+     * @param syglSalesArchives 销售档案
+     * @return 结果
+     */
+    @Override
+    public int updateSyglSalesArchives(SyglSalesArchives syglSalesArchives)
+    {
+        syglSalesArchives.setUpdateTime(DateUtils.getNowDate());
+        syglSalesArchives.setUpdateBy(ShiroUtils.getLoginName());
+        return syglSalesArchivesMapper.updateSyglSalesArchives(syglSalesArchives);
+    }
+
+    /**
+     * 删除销售档案对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglSalesArchivesByIds(String ids)
+    {
+        return syglSalesArchivesMapper.deleteSyglSalesArchivesByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除销售档案信息
+     * 
+     * @param id 销售档案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglSalesArchivesById(String id)
+    {
+        return syglSalesArchivesMapper.deleteSyglSalesArchivesById(id);
+    }
+}

+ 126 - 0
mybusiness/src/main/java/com/business/zhnc/staffInfo/controller/SyglStaffInfoController.java

@@ -0,0 +1,126 @@
+package com.business.zhnc.staffInfo.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.sooka.common.annotation.Log;
+import com.sooka.common.enums.BusinessType;
+import com.business.zhnc.staffInfo.domain.SyglStaffInfo;
+import com.business.zhnc.staffInfo.service.ISyglStaffInfoService;
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.common.core.page.TableDataInfo;
+
+/**
+ * 职员信息管理Controller
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Controller
+@RequestMapping("/staffInfo/info")
+public class SyglStaffInfoController extends BaseController
+{
+    private String prefix = "staffInfo/info";
+
+    @Autowired
+    private ISyglStaffInfoService syglStaffInfoService;
+
+    @RequiresPermissions("staffInfo:info:view")
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/info";
+    }
+
+    /**
+     * 查询职员信息管理列表
+     */
+    @RequiresPermissions("staffInfo:info:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SyglStaffInfo syglStaffInfo)
+    {
+        startPage();
+        List<SyglStaffInfo> list = syglStaffInfoService.selectSyglStaffInfoList(syglStaffInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出职员信息管理列表
+     */
+    @RequiresPermissions("staffInfo:info:export")
+    @Log(title = "职员信息管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SyglStaffInfo syglStaffInfo)
+    {
+        List<SyglStaffInfo> list = syglStaffInfoService.selectSyglStaffInfoList(syglStaffInfo);
+        ExcelUtil<SyglStaffInfo> util = new ExcelUtil<SyglStaffInfo>(SyglStaffInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 新增职员信息管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存职员信息管理
+     */
+    @RequiresPermissions("staffInfo:info:add")
+    @Log(title = "职员信息管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SyglStaffInfo syglStaffInfo)
+    {
+        return toAjax(syglStaffInfoService.insertSyglStaffInfo(syglStaffInfo));
+    }
+
+    /**
+     * 修改职员信息管理
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        SyglStaffInfo syglStaffInfo = syglStaffInfoService.selectSyglStaffInfoById(id);
+        mmap.put("syglStaffInfo", syglStaffInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存职员信息管理
+     */
+    @RequiresPermissions("staffInfo:info:edit")
+    @Log(title = "职员信息管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SyglStaffInfo syglStaffInfo)
+    {
+        return toAjax(syglStaffInfoService.updateSyglStaffInfo(syglStaffInfo));
+    }
+
+    /**
+     * 删除职员信息管理
+     */
+    @RequiresPermissions("staffInfo:info:remove")
+    @Log(title = "职员信息管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(syglStaffInfoService.deleteSyglStaffInfoByIds(ids));
+    }
+}

+ 112 - 0
mybusiness/src/main/java/com/business/zhnc/staffInfo/domain/SyglStaffInfo.java

@@ -0,0 +1,112 @@
+package com.business.zhnc.staffInfo.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sooka.common.annotation.Excel;
+import com.sooka.common.core.domain.BaseEntity;
+
+/**
+ * 职员信息管理对象 sygl_staff_info
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public class SyglStaffInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private String sex;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    private String idCard;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSex(String sex) 
+    {
+        this.sex = sex;
+    }
+
+    public String getSex() 
+    {
+        return sex;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("idCard", getIdCard())
+            .append("address", getAddress())
+            .append("phone", getPhone())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/staffInfo/mapper/SyglStaffInfoMapper.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.staffInfo.mapper;
+
+import java.util.List;
+import com.business.zhnc.staffInfo.domain.SyglStaffInfo;
+
+/**
+ * 职员信息管理Mapper接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface SyglStaffInfoMapper 
+{
+    /**
+     * 查询职员信息管理
+     * 
+     * @param id 职员信息管理ID
+     * @return 职员信息管理
+     */
+    public SyglStaffInfo selectSyglStaffInfoById(String id);
+
+    /**
+     * 查询职员信息管理列表
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 职员信息管理集合
+     */
+    public List<SyglStaffInfo> selectSyglStaffInfoList(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 新增职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    public int insertSyglStaffInfo(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 修改职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    public int updateSyglStaffInfo(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 删除职员信息管理
+     * 
+     * @param id 职员信息管理ID
+     * @return 结果
+     */
+    public int deleteSyglStaffInfoById(String id);
+
+    /**
+     * 批量删除职员信息管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglStaffInfoByIds(String[] ids);
+}

+ 61 - 0
mybusiness/src/main/java/com/business/zhnc/staffInfo/service/ISyglStaffInfoService.java

@@ -0,0 +1,61 @@
+package com.business.zhnc.staffInfo.service;
+
+import java.util.List;
+import com.business.zhnc.staffInfo.domain.SyglStaffInfo;
+
+/**
+ * 职员信息管理Service接口
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+public interface ISyglStaffInfoService 
+{
+    /**
+     * 查询职员信息管理
+     * 
+     * @param id 职员信息管理ID
+     * @return 职员信息管理
+     */
+    public SyglStaffInfo selectSyglStaffInfoById(String id);
+
+    /**
+     * 查询职员信息管理列表
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 职员信息管理集合
+     */
+    public List<SyglStaffInfo> selectSyglStaffInfoList(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 新增职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    public int insertSyglStaffInfo(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 修改职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    public int updateSyglStaffInfo(SyglStaffInfo syglStaffInfo);
+
+    /**
+     * 批量删除职员信息管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSyglStaffInfoByIds(String ids);
+
+    /**
+     * 删除职员信息管理信息
+     * 
+     * @param id 职员信息管理ID
+     * @return 结果
+     */
+    public int deleteSyglStaffInfoById(String id);
+}

+ 101 - 0
mybusiness/src/main/java/com/business/zhnc/staffInfo/service/impl/SyglStaffInfoServiceImpl.java

@@ -0,0 +1,101 @@
+package com.business.zhnc.staffInfo.service.impl;
+
+import java.util.List;
+import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.business.zhnc.staffInfo.mapper.SyglStaffInfoMapper;
+import com.business.zhnc.staffInfo.domain.SyglStaffInfo;
+import com.business.zhnc.staffInfo.service.ISyglStaffInfoService;
+import com.sooka.common.core.text.Convert;
+
+/**
+ * 职员信息管理Service业务层处理
+ * 
+ * @author lei
+ * @date 2022-05-04
+ */
+@Service
+public class SyglStaffInfoServiceImpl implements ISyglStaffInfoService 
+{
+    @Autowired
+    private SyglStaffInfoMapper syglStaffInfoMapper;
+
+    /**
+     * 查询职员信息管理
+     * 
+     * @param id 职员信息管理ID
+     * @return 职员信息管理
+     */
+    @Override
+    public SyglStaffInfo selectSyglStaffInfoById(String id)
+    {
+        return syglStaffInfoMapper.selectSyglStaffInfoById(id);
+    }
+
+    /**
+     * 查询职员信息管理列表
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 职员信息管理
+     */
+    @Override
+    public List<SyglStaffInfo> selectSyglStaffInfoList(SyglStaffInfo syglStaffInfo)
+    {
+        return syglStaffInfoMapper.selectSyglStaffInfoList(syglStaffInfo);
+    }
+
+    /**
+     * 新增职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    @Override
+    public int insertSyglStaffInfo(SyglStaffInfo syglStaffInfo)
+    {
+        syglStaffInfo.setId(ShiroUtils.uuid());
+        syglStaffInfo.setCreateTime(DateUtils.getNowDate());
+        syglStaffInfo.setCreateBy(ShiroUtils.getLoginName());
+        return syglStaffInfoMapper.insertSyglStaffInfo(syglStaffInfo);
+    }
+
+    /**
+     * 修改职员信息管理
+     * 
+     * @param syglStaffInfo 职员信息管理
+     * @return 结果
+     */
+    @Override
+    public int updateSyglStaffInfo(SyglStaffInfo syglStaffInfo)
+    {
+        syglStaffInfo.setUpdateTime(DateUtils.getNowDate());
+        syglStaffInfo.setUpdateBy(ShiroUtils.getLoginName());
+        return syglStaffInfoMapper.updateSyglStaffInfo(syglStaffInfo);
+    }
+
+    /**
+     * 删除职员信息管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglStaffInfoByIds(String ids)
+    {
+        return syglStaffInfoMapper.deleteSyglStaffInfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除职员信息管理信息
+     * 
+     * @param id 职员信息管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSyglStaffInfoById(String id)
+    {
+        return syglStaffInfoMapper.deleteSyglStaffInfoById(id);
+    }
+}

+ 57 - 0
mybusiness/src/main/java/com/business/zhnc/syWeb/controller/SyWebController.java

@@ -0,0 +1,57 @@
+package com.business.zhnc.syWeb.controller;
+
+import com.sooka.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 溯源web
+ * @author wang_xy
+ * @description
+ * @Version 1.0
+ * @params
+ * @return
+ * @since 2022/5/10 15:04
+ */
+@Controller
+@RequestMapping("/ksh")
+public class SyWebController extends BaseController {
+
+    private String prefix = "ksh";
+
+    @GetMapping()
+    public String info(ModelMap mmap) {
+        String ip = "222.161.138.120";
+        String[] ports = new String[]{"8011","8012","8013","8014","8015","8016","8017","8018","8019","8020","8021","8022","8023","8024","8025","8026","8027","8028","8029","8030","8111","8112","8113","8114","8115","8116","8117","8118"};
+        String account = "admin";
+        String password = "qingchamuye123";
+        List<Map<String,Object>> ret = new ArrayList<>();
+        for (String port : ports) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("ip",ip);
+            map.put("port",port);
+            map.put("account",account);
+            map.put("password",password);
+            ret.add(map);
+        }
+        mmap.put("list",ret);
+        return prefix + "/ksh";
+    }
+
+    /**
+     * 查询职员信息管理列表
+     */
+    @GetMapping("/kshOne")
+    public String kshOne() {
+        return prefix + "/ksh_t1";
+    }
+
+}

+ 33 - 0
mybusiness/src/main/java/com/business/zhnc/visualizationDemo/visualizationDemoController.java

@@ -0,0 +1,33 @@
+package com.business.zhnc.visualizationDemo;
+
+import com.sooka.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 大数据可视化DEMOController
+ *
+ * @author sunwei
+ * @date 2022-05-10
+ */
+@Controller
+@RequestMapping("/visualizationDemo")
+public class visualizationDemoController extends BaseController
+{
+    private String prefix = "visualizationDemo";
+
+
+    @GetMapping("/bigdata")
+    public String bigdata()
+    {
+        return prefix + "/bigdata";
+    }
+
+    @GetMapping("/visualization")
+    public String visualization()
+    {
+        return prefix + "/visualization";
+    }
+
+}

+ 13 - 0
mybusiness/src/main/java/com/business/zhnc/webSocket/WebSocketConfig.java

@@ -0,0 +1,13 @@
+package com.business.zhnc.webSocket;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+//
+//@Component
+public class WebSocketConfig {
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter(){
+//        return new ServerEndpointExporter();
+//    }
+}

+ 49 - 0
mybusiness/src/main/java/com/business/zhnc/webSocket/Websocket.java

@@ -0,0 +1,49 @@
+package com.business.zhnc.webSocket;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import javax.websocket.OnClose;
+//import javax.websocket.OnMessage;
+//import javax.websocket.OnOpen;
+//import javax.websocket.Session;
+//import javax.websocket.server.ServerEndpoint;
+//import java.util.concurrent.CopyOnWriteArraySet;
+//
+//@Component
+//@ServerEndpoint("/webSocket")
+//@Slf4j
+public class Websocket {
+//
+//    private Session session;
+//
+//    private static CopyOnWriteArraySet<Websocket> websocket = new CopyOnWriteArraySet<>();
+//
+//    @OnOpen
+//    public void onOpen(Session session){
+//        this.session =session;
+//        websocket.add(this);
+//        log.info("【websocket消息】有新的连接,总数:{}",websocket.size());
+//    }
+//    @OnClose
+//    public void onClose(){
+//        websocket.remove(this);
+//        log.info("【websocket消息】连接断开,总数:{}",websocket.size());
+//    }
+//
+//    @OnMessage
+//    public void onMessage(String message){
+//        log.info("【websocket消息】,收到客户端发来的消息:{}",message);
+//    }
+//    public void sendMessage(String message){
+//        for (Websocket websocket : websocket) {
+//            log.info("【websocket消息】广播消息:{}",message);
+//            try {
+//                websocket.session.getBasicRemote().sendText(message);
+//            }
+//            catch (Exception e){
+//                e.printStackTrace();
+//
+//            }        }
+//    }
+}

+ 23 - 0
mybusiness/src/main/java/com/business/zhnc/webSocket/WebsocketTest.java

@@ -0,0 +1,23 @@
+package com.business.zhnc.webSocket;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@RestController
+//@RequestMapping("/test")
+//@Slf4j
+public class WebsocketTest {
+//    @Autowired
+//    private Websocket websocket;
+//
+//    @RequestMapping(value = "/a",method = RequestMethod.GET)
+//    public String  test(String a){
+//        if (a!=null){
+//            websocket.sendMessage(a);
+//        }
+//        return a;
+//    }
+}

+ 26 - 0
mybusiness/src/main/java/com/business/zhnc/website/controller/WebsiteController.java

@@ -0,0 +1,26 @@
+package com.business.zhnc.website.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.sooka.common.core.controller.BaseController;
+
+/**
+ * 门户网站Controller
+ *
+ * @author sunwei
+ * @date 2022-05-10
+ */
+@Controller
+@RequestMapping("/website")
+public class WebsiteController extends BaseController
+{
+    private String prefix = "website";
+
+    @GetMapping()
+    public String info()
+    {
+        return prefix + "/websiteIndex";
+    }
+
+}

+ 114 - 0
mybusiness/src/main/resources/mapper/cattleFarm/SyglCattleFarmMapper.xml

@@ -0,0 +1,114 @@
+<?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.business.zhnc.cattleFarm.mapper.SyglCattleFarmMapper">
+    
+    <resultMap type="SyglCattleFarm" id="SyglCattleFarmResult">
+        <result property="id"    column="id"    />
+        <result property="level"    column="level"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="responsiblePerson"    column="responsible_person"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="phone"    column="phone"    />
+        <result property="synopsis"    column="synopsis"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglCattleFarmVo">
+        select id, level, name, code, responsible_person, latitude, longitude, phone, synopsis, create_time, update_time, create_by, update_by, remark from sygl_cattle_farm
+    </sql>
+
+    <select id="selectSyglCattleFarmList" parameterType="SyglCattleFarm" resultMap="SyglCattleFarmResult">
+        <include refid="selectSyglCattleFarmVo"/>
+        <where>  
+            <if test="level != null  and level != ''"> and level = #{level}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="responsiblePerson != null  and responsiblePerson != ''"> and responsible_person = #{responsiblePerson}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="synopsis != null  and synopsis != ''"> and synopsis = #{synopsis}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglCattleFarmById" parameterType="String" resultMap="SyglCattleFarmResult">
+        <include refid="selectSyglCattleFarmVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglCattleFarm" parameterType="SyglCattleFarm">
+        insert into sygl_cattle_farm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="level != null">level,</if>
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="responsiblePerson != null">responsible_person,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="phone != null">phone,</if>
+            <if test="synopsis != null">synopsis,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="level != null">#{level},</if>
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="responsiblePerson != null">#{responsiblePerson},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="synopsis != null">#{synopsis},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglCattleFarm" parameterType="SyglCattleFarm">
+        update sygl_cattle_farm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="level != null">level = #{level},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="synopsis != null">synopsis = #{synopsis},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglCattleFarmById" parameterType="String">
+        delete from sygl_cattle_farm where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglCattleFarmByIds" parameterType="String">
+        delete from sygl_cattle_farm where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 94 - 0
mybusiness/src/main/resources/mapper/cattleGrowRecord/SyglCattleGrowRecordMapper.xml

@@ -0,0 +1,94 @@
+<?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.business.zhnc.cattleGrowRecord.mapper.SyglCattleGrowRecordMapper">
+    
+    <resultMap type="SyglCattleGrowRecord" id="SyglCattleGrowRecordResult">
+        <result property="id"    column="id"    />
+        <result property="cattleId"    column="cattle_id"    />
+        <result property="age"    column="age"    />
+        <result property="weight"    column="weight"    />
+        <result property="temperature"    column="temperature"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglCattleGrowRecordVo">
+        select id, cattle_id, age, weight, temperature, create_time, update_time, create_by, update_by, remark from sygl_cattle_grow_record
+    </sql>
+
+    <select id="selectSyglCattleGrowRecordList" parameterType="SyglCattleGrowRecord" resultMap="SyglCattleGrowRecordResult">
+        <include refid="selectSyglCattleGrowRecordVo"/>
+        <where>  
+            <if test="cattleId != null  and cattleId != ''"> and cattle_id = #{cattleId}</if>
+            <if test="age != null  and age != ''"> and age = #{age}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglCattleGrowRecordById" parameterType="String" resultMap="SyglCattleGrowRecordResult">
+        <include refid="selectSyglCattleGrowRecordVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglCattleGrowRecord" parameterType="SyglCattleGrowRecord">
+        insert into sygl_cattle_grow_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="cattleId != null">cattle_id,</if>
+            <if test="age != null">age,</if>
+            <if test="weight != null">weight,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="cattleId != null">#{cattleId},</if>
+            <if test="age != null">#{age},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglCattleGrowRecord" parameterType="SyglCattleGrowRecord">
+        update sygl_cattle_grow_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cattleId != null">cattle_id = #{cattleId},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglCattleGrowRecordById" parameterType="String">
+        delete from sygl_cattle_grow_record where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglCattleGrowRecordByIds" parameterType="String">
+        delete from sygl_cattle_grow_record where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 159 - 0
mybusiness/src/main/resources/mapper/cattleInfo/SyglCattleInfoMapper.xml

@@ -0,0 +1,159 @@
+<?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.business.zhnc.cattleInfo.mapper.SyglCattleInfoMapper">
+
+    <resultMap type="SyglCattleInfo" id="SyglCattleInfoResult">
+        <result property="id"    column="id"    />
+        <result property="no"    column="no"    />
+        <result property="isAdopt"    column="is_adopt"    />
+        <result property="isCheckin"    column="is_checkin"    />
+        <result property="isCattle"    column="is_cattle"    />
+        <result property="initialWeight"    column="initial_weight"    />
+        <result property="variety"    column="variety"    />
+        <result property="monthAge"    column="month_age"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="slaughterTime"    column="slaughter_time"    />
+        <result property="growthCycle"    column="growth_cycle"    />
+        <result property="status"    column="status"    />
+        <result property="code"    column="code"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="purchaseCost"    column="purchase_cost"    />
+        <result property="filePath"    column="file_path"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="isChulan"    column="is_chulan"    />
+    </resultMap>
+
+    <sql id="selectSyglCattleInfoVo">
+        select id, no, is_adopt, is_checkin, is_cattle, initial_weight, variety, month_age, start_time, delivery_time, slaughter_time, growth_cycle, status, code, qr_code, purchase_cost, file_path, create_time, update_time, create_by, update_by, remark, is_chulan from sygl_cattle_info
+    </sql>
+
+    <select id="selectSyglCattleInfoList" parameterType="SyglCattleInfo" resultMap="SyglCattleInfoResult">
+        <include refid="selectSyglCattleInfoVo"/>
+        <where>
+            <if test="no != null  and no != ''"> and no = #{no}</if>
+            <if test="isAdopt != null  and isAdopt != ''"> and is_adopt = #{isAdopt}</if>
+            <if test="isCheckin != null  and isCheckin != ''"> and is_checkin = #{isCheckin}</if>
+            <if test="isCattle != null  and isCattle != ''"> and is_cattle = #{isCattle}</if>
+            <if test="initialWeight != null  and initialWeight != ''"> and initial_weight = #{initialWeight}</if>
+            <if test="variety != null  and variety != ''"> and variety = #{variety}</if>
+            <if test="monthAge != null  and monthAge != ''"> and month_age = #{monthAge}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="deliveryTime != null "> and delivery_time = #{deliveryTime}</if>
+            <if test="slaughterTime != null "> and slaughter_time = #{slaughterTime}</if>
+            <if test="growthCycle != null  and growthCycle != ''"> and growth_cycle = #{growthCycle}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="purchaseCost != null  and purchaseCost != ''"> and purchase_cost = #{purchaseCost}</if>
+            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
+            <if test="isChulan != null  and isChulan != ''"> and is_chulan = #{isChulan}</if>
+        </where>
+    </select>
+
+    <select id="selectSyglCattleInfoById" parameterType="String" resultMap="SyglCattleInfoResult">
+        <include refid="selectSyglCattleInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSyglCattleInfo" parameterType="SyglCattleInfo">
+        insert into sygl_cattle_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="no != null">no,</if>
+            <if test="isAdopt != null">is_adopt,</if>
+            <if test="isCheckin != null">is_checkin,</if>
+            <if test="isCattle != null">is_cattle,</if>
+            <if test="initialWeight != null">initial_weight,</if>
+            <if test="variety != null">variety,</if>
+            <if test="monthAge != null">month_age,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="slaughterTime != null">slaughter_time,</if>
+            <if test="growthCycle != null">growth_cycle,</if>
+            <if test="status != null">status,</if>
+            <if test="code != null">code,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="purchaseCost != null">purchase_cost,</if>
+            <if test="filePath != null">file_path,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isChulan != null">is_chulan,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="no != null">#{no},</if>
+            <if test="isAdopt != null">#{isAdopt},</if>
+            <if test="isCheckin != null">#{isCheckin},</if>
+            <if test="isCattle != null">#{isCattle},</if>
+            <if test="initialWeight != null">#{initialWeight},</if>
+            <if test="variety != null">#{variety},</if>
+            <if test="monthAge != null">#{monthAge},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="slaughterTime != null">#{slaughterTime},</if>
+            <if test="growthCycle != null">#{growthCycle},</if>
+            <if test="status != null">#{status},</if>
+            <if test="code != null">#{code},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="purchaseCost != null">#{purchaseCost},</if>
+            <if test="filePath != null">#{filePath},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isChulan != null">#{isChulan},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglCattleInfo" parameterType="SyglCattleInfo">
+        update sygl_cattle_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="no != null">no = #{no},</if>
+            <if test="isAdopt != null">is_adopt = #{isAdopt},</if>
+            <if test="isCheckin != null">is_checkin = #{isCheckin},</if>
+            <if test="isCattle != null">is_cattle = #{isCattle},</if>
+            <if test="initialWeight != null">initial_weight = #{initialWeight},</if>
+            <if test="variety != null">variety = #{variety},</if>
+            <if test="monthAge != null">month_age = #{monthAge},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="slaughterTime != null">slaughter_time = #{slaughterTime},</if>
+            <if test="growthCycle != null">growth_cycle = #{growthCycle},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="purchaseCost != null">purchase_cost = #{purchaseCost},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isChulan != null">is_chulan = #{isChulan},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglCattleInfoById" parameterType="String">
+        delete from sygl_cattle_info where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglCattleInfoByIds" parameterType="String">
+        delete from sygl_cattle_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 98 - 0
mybusiness/src/main/resources/mapper/cowshedInfo/SyglCowshedInfoMapper.xml

@@ -0,0 +1,98 @@
+<?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.business.zhnc.cowshedInfo.mapper.SyglCowshedInfoMapper">
+    
+    <resultMap type="SyglCowshedInfo" id="SyglCowshedInfoResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="accommodateNum"    column="accommodate_num"    />
+        <result property="varieties"    column="varieties"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="cattleFarmId"    column="cattle_farm_id"    />
+    </resultMap>
+
+    <sql id="selectSyglCowshedInfoVo">
+        select id, name, code, accommodate_num, varieties, create_time, update_time, create_by, update_by, remark, cattle_farm_id from sygl_cowshed_info
+    </sql>
+
+    <select id="selectSyglCowshedInfoList" parameterType="SyglCowshedInfo" resultMap="SyglCowshedInfoResult">
+        <include refid="selectSyglCowshedInfoVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="accommodateNum != null  and accommodateNum != ''"> and accommodate_num = #{accommodateNum}</if>
+            <if test="varieties != null  and varieties != ''"> and varieties = #{varieties}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglCowshedInfoById" parameterType="String" resultMap="SyglCowshedInfoResult">
+        <include refid="selectSyglCowshedInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglCowshedInfo" parameterType="SyglCowshedInfo">
+        insert into sygl_cowshed_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="accommodateNum != null">accommodate_num,</if>
+            <if test="varieties != null">varieties,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="cattleFarmId != null">cattle_farm_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="accommodateNum != null">#{accommodateNum},</if>
+            <if test="varieties != null">#{varieties},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="cattleFarmId != null">#{cattleFarmId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglCowshedInfo" parameterType="SyglCowshedInfo">
+        update sygl_cowshed_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="accommodateNum != null">accommodate_num = #{accommodateNum},</if>
+            <if test="varieties != null">varieties = #{varieties},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="cattleFarmId != null">cattle_farm_id = #{cattleFarmId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglCowshedInfoById" parameterType="String">
+        delete from sygl_cowshed_info where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglCowshedInfoByIds" parameterType="String">
+        delete from sygl_cowshed_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 109 - 0
mybusiness/src/main/resources/mapper/diseaseArchives/SyglDiseaseArchivesMapper.xml

@@ -0,0 +1,109 @@
+<?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.business.zhnc.diseaseArchives.mapper.SyglDiseaseArchivesMapper">
+    
+    <resultMap type="SyglDiseaseArchives" id="SyglDiseaseArchivesResult">
+        <result property="id"    column="id"    />
+        <result property="cattleNo"    column="cattle_no"    />
+        <result property="diseaseName"    column="disease_name"    />
+        <result property="treatPersonnel"    column="treat_personnel"    />
+        <result property="treatPlan"    column="treat_plan"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="treatStart"    column="treat_start"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglDiseaseArchivesVo">
+        select id, cattle_no, disease_name, treat_personnel, treat_plan, start_time, end_time, treat_start, create_time, update_time, create_by, update_by, remark from sygl_disease_archives
+    </sql>
+
+    <select id="selectSyglDiseaseArchivesList" parameterType="SyglDiseaseArchives" resultMap="SyglDiseaseArchivesResult">
+        <include refid="selectSyglDiseaseArchivesVo"/>
+        <where>  
+            <if test="cattleNo != null  and cattleNo != ''"> and cattle_no = #{cattleNo}</if>
+            <if test="diseaseName != null  and diseaseName != ''"> and disease_name like concat('%', #{diseaseName}, '%')</if>
+            <if test="treatPersonnel != null  and treatPersonnel != ''"> and treat_personnel = #{treatPersonnel}</if>
+            <if test="treatPlan != null  and treatPlan != ''"> and treat_plan = #{treatPlan}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="treatStart != null  and treatStart != ''"> and treat_start = #{treatStart}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglDiseaseArchivesById" parameterType="String" resultMap="SyglDiseaseArchivesResult">
+        <include refid="selectSyglDiseaseArchivesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglDiseaseArchives" parameterType="SyglDiseaseArchives">
+        insert into sygl_disease_archives
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="cattleNo != null">cattle_no,</if>
+            <if test="diseaseName != null">disease_name,</if>
+            <if test="treatPersonnel != null">treat_personnel,</if>
+            <if test="treatPlan != null">treat_plan,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="treatStart != null">treat_start,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="cattleNo != null">#{cattleNo},</if>
+            <if test="diseaseName != null">#{diseaseName},</if>
+            <if test="treatPersonnel != null">#{treatPersonnel},</if>
+            <if test="treatPlan != null">#{treatPlan},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="treatStart != null">#{treatStart},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglDiseaseArchives" parameterType="SyglDiseaseArchives">
+        update sygl_disease_archives
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cattleNo != null">cattle_no = #{cattleNo},</if>
+            <if test="diseaseName != null">disease_name = #{diseaseName},</if>
+            <if test="treatPersonnel != null">treat_personnel = #{treatPersonnel},</if>
+            <if test="treatPlan != null">treat_plan = #{treatPlan},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="treatStart != null">treat_start = #{treatStart},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglDiseaseArchivesById" parameterType="String">
+        delete from sygl_disease_archives where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglDiseaseArchivesByIds" parameterType="String">
+        delete from sygl_disease_archives where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 94 - 0
mybusiness/src/main/resources/mapper/drugsArchives/SyglDrugsArchivesMapper.xml

@@ -0,0 +1,94 @@
+<?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.business.zhnc.drugsArchives.mapper.SyglDrugsArchivesMapper">
+    
+    <resultMap type="SyglDrugsArchives" id="SyglDrugsArchivesResult">
+        <result property="id"    column="id"    />
+        <result property="drugsName"    column="drugs_name"    />
+        <result property="batch"    column="batch"    />
+        <result property="personnel"    column="personnel"    />
+        <result property="drugsTime"    column="drugs_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglDrugsArchivesVo">
+        select id, drugs_name, batch, personnel, drugs_time, create_time, update_time, create_by, update_by, remark from sygl_drugs_archives
+    </sql>
+
+    <select id="selectSyglDrugsArchivesList" parameterType="SyglDrugsArchives" resultMap="SyglDrugsArchivesResult">
+        <include refid="selectSyglDrugsArchivesVo"/>
+        <where>  
+            <if test="drugsName != null  and drugsName != ''"> and drugs_name like concat('%', #{drugsName}, '%')</if>
+            <if test="batch != null  and batch != ''"> and batch = #{batch}</if>
+            <if test="personnel != null  and personnel != ''"> and personnel = #{personnel}</if>
+            <if test="drugsTime != null "> and drugs_time = #{drugsTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglDrugsArchivesById" parameterType="String" resultMap="SyglDrugsArchivesResult">
+        <include refid="selectSyglDrugsArchivesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglDrugsArchives" parameterType="SyglDrugsArchives">
+        insert into sygl_drugs_archives
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="drugsName != null">drugs_name,</if>
+            <if test="batch != null">batch,</if>
+            <if test="personnel != null">personnel,</if>
+            <if test="drugsTime != null">drugs_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="drugsName != null">#{drugsName},</if>
+            <if test="batch != null">#{batch},</if>
+            <if test="personnel != null">#{personnel},</if>
+            <if test="drugsTime != null">#{drugsTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglDrugsArchives" parameterType="SyglDrugsArchives">
+        update sygl_drugs_archives
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="drugsName != null">drugs_name = #{drugsName},</if>
+            <if test="batch != null">batch = #{batch},</if>
+            <if test="personnel != null">personnel = #{personnel},</if>
+            <if test="drugsTime != null">drugs_time = #{drugsTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglDrugsArchivesById" parameterType="String">
+        delete from sygl_drugs_archives where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglDrugsArchivesByIds" parameterType="String">
+        delete from sygl_drugs_archives where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 94 - 0
mybusiness/src/main/resources/mapper/fire/YjglFireMapper.xml

@@ -0,0 +1,94 @@
+<?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.business.zhnc.fire.mapper.YjglFireMapper">
+
+    <resultMap type="YjglFire" id="YjglFireResult">
+        <result property="id"    column="id"    />
+        <result property="fireSize"    column="fire_size"    />
+        <result property="isPutout"    column="is_putout"    />
+        <result property="cattleFarmId"    column="cattle_farm_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="cattleFarmName"    column="cattle_farm_name"    />
+    </resultMap>
+
+    <sql id="selectYjglFireVo">
+        select id, fire_size, is_putout, cattle_farm_id, create_time, update_time, create_by, update_by, remark from yjgl_fire
+    </sql>
+
+    <sql id="joinSelectYjglFireVo">
+        select a.id, a.fire_size, a.is_putout, a.cattle_farm_id, a.create_time, a.update_time, a.create_by, a.update_by, a.remark, b.name as cattle_farm_name from yjgl_fire a left join sygl_cattle_farm b on a.cattle_farm_id=b.id
+    </sql>
+
+    <select id="selectYjglFireList" parameterType="YjglFire" resultMap="YjglFireResult">
+        <include refid="joinSelectYjglFireVo"/>
+        <where>
+            <if test="fireSize != null  and fireSize != ''"> and a.fire_size = #{fireSize}</if>
+            <if test="isPutout != null  and isPutout != ''"> and a.is_putout = #{isPutout}</if>
+            <if test="cattleFarmId != null  and cattleFarmId != ''"> and a.cattle_farm_id = #{cattleFarmId}</if>
+        </where>
+    </select>
+
+    <select id="selectYjglFireById" parameterType="String" resultMap="YjglFireResult">
+        <include refid="selectYjglFireVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertYjglFire" parameterType="YjglFire">
+        insert into yjgl_fire
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="fireSize != null">fire_size,</if>
+            <if test="isPutout != null">is_putout,</if>
+            <if test="cattleFarmId != null">cattle_farm_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="fireSize != null">#{fireSize},</if>
+            <if test="isPutout != null">#{isPutout},</if>
+            <if test="cattleFarmId != null">#{cattleFarmId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateYjglFire" parameterType="YjglFire">
+        update yjgl_fire
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fireSize != null">fire_size = #{fireSize},</if>
+            <if test="isPutout != null">is_putout = #{isPutout},</if>
+            <if test="cattleFarmId != null">cattle_farm_id = #{cattleFarmId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteYjglFireById" parameterType="String">
+        delete from yjgl_fire where id = #{id}
+    </delete>
+
+    <delete id="deleteYjglFireByIds" parameterType="String">
+        delete from yjgl_fire where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 93 - 0
mybusiness/src/main/resources/mapper/intrusion/YjglIntrusionMapper.xml

@@ -0,0 +1,93 @@
+<?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.business.zhnc.intrusion.mapper.YjglIntrusionMapper">
+
+    <resultMap type="YjglIntrusion" id="YjglIntrusionResult">
+        <result property="id"    column="id"    />
+        <result property="intrusionType"    column="intrusion_type"    />
+        <result property="isSee"    column="is_see"    />
+        <result property="cattleFarmId"    column="cattle_farm_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="cattleFarmName"    column="cattle_farm_name"    />
+    </resultMap>
+
+    <sql id="selectYjglIntrusionVo">
+        select id, intrusion_type, is_see, cattle_farm_id, create_time, update_time, create_by, update_by, remark from yjgl_intrusion
+    </sql>
+    <sql id="joinSelectYjglIntrusionVo">
+        select a.id, a.intrusion_type, a.is_see, a.cattle_farm_id, a.create_time, a.update_time, a.create_by, a.update_by, a.remark, b.name as cattle_farm_name from yjgl_intrusion a left join sygl_cattle_farm b on a.cattle_farm_id=b.id
+    </sql>
+
+    <select id="selectYjglIntrusionList" parameterType="YjglIntrusion" resultMap="YjglIntrusionResult">
+        <include refid="joinSelectYjglIntrusionVo"/>
+        <where>
+            <if test="intrusionType != null  and intrusionType != ''"> and a.intrusion_type = #{intrusionType}</if>
+            <if test="isSee != null  and isSee != ''"> and a.is_see = #{isSee}</if>
+            <if test="cattleFarmId != null  and cattleFarmId != ''"> and a.cattle_farm_id = #{cattleFarmId}</if>
+        </where>
+    </select>
+
+    <select id="selectYjglIntrusionById" parameterType="String" resultMap="YjglIntrusionResult">
+        <include refid="selectYjglIntrusionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertYjglIntrusion" parameterType="YjglIntrusion">
+        insert into yjgl_intrusion
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="intrusionType != null">intrusion_type,</if>
+            <if test="isSee != null">is_see,</if>
+            <if test="cattleFarmId != null">cattle_farm_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="intrusionType != null">#{intrusionType},</if>
+            <if test="isSee != null">#{isSee},</if>
+            <if test="cattleFarmId != null">#{cattleFarmId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateYjglIntrusion" parameterType="YjglIntrusion">
+        update yjgl_intrusion
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="intrusionType != null">intrusion_type = #{intrusionType},</if>
+            <if test="isSee != null">is_see = #{isSee},</if>
+            <if test="cattleFarmId != null">cattle_farm_id = #{cattleFarmId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteYjglIntrusionById" parameterType="String">
+        delete from yjgl_intrusion where id = #{id}
+    </delete>
+
+    <delete id="deleteYjglIntrusionByIds" parameterType="String">
+        delete from yjgl_intrusion where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 104 - 0
mybusiness/src/main/resources/mapper/machiningArchives/SyglMachiningArchivesMapper.xml

@@ -0,0 +1,104 @@
+<?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.business.zhnc.machiningArchives.mapper.SyglMachiningArchivesMapper">
+    
+    <resultMap type="SyglMachiningArchives" id="SyglMachiningArchivesResult">
+        <result property="id"    column="id"    />
+        <result property="processingWorkshop"    column="processing_workshop"    />
+        <result property="operator"    column="operator"    />
+        <result property="packagingPersonnel"    column="packaging_personnel"    />
+        <result property="product"    column="product"    />
+        <result property="grade"    column="grade"    />
+        <result property="processingTime"    column="processing_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglMachiningArchivesVo">
+        select id, processing_workshop, operator, packaging_personnel, product, grade, processing_time, create_time, update_time, create_by, update_by, remark from sygl_machining_archives
+    </sql>
+
+    <select id="selectSyglMachiningArchivesList" parameterType="SyglMachiningArchives" resultMap="SyglMachiningArchivesResult">
+        <include refid="selectSyglMachiningArchivesVo"/>
+        <where>  
+            <if test="processingWorkshop != null  and processingWorkshop != ''"> and processing_workshop = #{processingWorkshop}</if>
+            <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
+            <if test="packagingPersonnel != null  and packagingPersonnel != ''"> and packaging_personnel = #{packagingPersonnel}</if>
+            <if test="product != null  and product != ''"> and product = #{product}</if>
+            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
+            <if test="processingTime != null "> and processing_time = #{processingTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglMachiningArchivesById" parameterType="String" resultMap="SyglMachiningArchivesResult">
+        <include refid="selectSyglMachiningArchivesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglMachiningArchives" parameterType="SyglMachiningArchives">
+        insert into sygl_machining_archives
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="processingWorkshop != null">processing_workshop,</if>
+            <if test="operator != null">operator,</if>
+            <if test="packagingPersonnel != null">packaging_personnel,</if>
+            <if test="product != null">product,</if>
+            <if test="grade != null">grade,</if>
+            <if test="processingTime != null">processing_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="processingWorkshop != null">#{processingWorkshop},</if>
+            <if test="operator != null">#{operator},</if>
+            <if test="packagingPersonnel != null">#{packagingPersonnel},</if>
+            <if test="product != null">#{product},</if>
+            <if test="grade != null">#{grade},</if>
+            <if test="processingTime != null">#{processingTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglMachiningArchives" parameterType="SyglMachiningArchives">
+        update sygl_machining_archives
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="processingWorkshop != null">processing_workshop = #{processingWorkshop},</if>
+            <if test="operator != null">operator = #{operator},</if>
+            <if test="packagingPersonnel != null">packaging_personnel = #{packagingPersonnel},</if>
+            <if test="product != null">product = #{product},</if>
+            <if test="grade != null">grade = #{grade},</if>
+            <if test="processingTime != null">processing_time = #{processingTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglMachiningArchivesById" parameterType="String">
+        delete from sygl_machining_archives where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglMachiningArchivesByIds" parameterType="String">
+        delete from sygl_machining_archives where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 141 - 0
mybusiness/src/main/resources/mapper/residentUser/YyglResidentUserMapper.xml

@@ -0,0 +1,141 @@
+<?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.business.zhnc.residentUser.mapper.YyglResidentUserMapper">
+
+    <resultMap type="YyglResidentUser" id="YyglResidentUserResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="location"    column="location"    />
+        <result property="contractYear"    column="contract_year"    />
+        <result property="isPeasant"    column="is_peasant"    />
+        <result property="isLoan"    column="is_loan"    />
+        <result property="occupancyScale"    column="occupancy_scale"    />
+        <result property="insurancePolicy"    column="insurance_policy"    />
+        <result property="contract"    column="contract"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="loanNum"    column="loan_num"    />
+        <result property="investmentCost"    column="investment_cost"    />
+        <result property="cattleNum"    column="cattle_num"    />
+        <result property="insurancePolicyPath"    column="insurance_policy_path"    />
+    </resultMap>
+
+    <sql id="selectYyglResidentUserVo">
+        select id, name, type, location, contract_year, is_peasant, is_loan, occupancy_scale,
+        insurance_policy, contract, create_time, update_time, create_by, update_by, remark, loan_num,
+        investment_cost, cattle_num,insurance_policy_path
+        from yygl_resident_user
+    </sql>
+
+    <select id="selectYyglResidentUserList" parameterType="YyglResidentUser" resultMap="YyglResidentUserResult">
+        <include refid="selectYyglResidentUserVo"/>
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="location != null  and location != ''"> and location = #{location}</if>
+            <if test="contractYear != null  and contractYear != ''"> and contract_year = #{contractYear}</if>
+            <if test="isPeasant != null  and isPeasant != ''"> and is_peasant = #{isPeasant}</if>
+            <if test="isLoan != null  and isLoan != ''"> and is_loan = #{isLoan}</if>
+            <if test="occupancyScale != null  and occupancyScale != ''"> and occupancy_scale = #{occupancyScale}</if>
+            <if test="insurancePolicy != null  and insurancePolicy != ''"> and insurance_policy = #{insurancePolicy}</if>
+            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
+            <if test="loanNum != null  and loanNum != ''"> and loan_num = #{loanNum}</if>
+            <if test="investmentCost != null  and investmentCost != ''"> and investment_cost = #{investmentCost}</if>
+            <if test="cattleNum != null  and cattleNum != ''"> and cattle_num = #{cattleNum}</if>
+        </where>
+    </select>
+
+    <select id="selectYyglResidentUserById" parameterType="String" resultMap="YyglResidentUserResult">
+        <include refid="selectYyglResidentUserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertYyglResidentUser" parameterType="YyglResidentUser">
+        insert into yygl_resident_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
+            <if test="location != null">location,</if>
+            <if test="contractYear != null">contract_year,</if>
+            <if test="isPeasant != null">is_peasant,</if>
+            <if test="isLoan != null">is_loan,</if>
+            <if test="occupancyScale != null">occupancy_scale,</if>
+            <if test="insurancePolicy != null">insurance_policy,</if>
+            <if test="contract != null">contract,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="loanNum != null">loan_num,</if>
+            <if test="investmentCost != null">investment_cost,</if>
+            <if test="cattleNum != null">cattle_num,</if>
+            <if test="insurancePolicyPath != null">insurance_policy_path,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="location != null">#{location},</if>
+            <if test="contractYear != null">#{contractYear},</if>
+            <if test="isPeasant != null">#{isPeasant},</if>
+            <if test="isLoan != null">#{isLoan},</if>
+            <if test="occupancyScale != null">#{occupancyScale},</if>
+            <if test="insurancePolicy != null">#{insurancePolicy},</if>
+            <if test="contract != null">#{contract},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="loanNum != null">#{loanNum},</if>
+            <if test="investmentCost != null">#{investmentCost},</if>
+            <if test="cattleNum != null">#{cattleNum},</if>
+            <if test="insurancePolicyPath != null">#{insurancePolicyPath},</if>
+         </trim>
+    </insert>
+
+    <update id="updateYyglResidentUser" parameterType="YyglResidentUser">
+        update yygl_resident_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="location != null">location = #{location},</if>
+            <if test="contractYear != null">contract_year = #{contractYear},</if>
+            <if test="isPeasant != null">is_peasant = #{isPeasant},</if>
+            <if test="isLoan != null">is_loan = #{isLoan},</if>
+            <if test="occupancyScale != null">occupancy_scale = #{occupancyScale},</if>
+            <if test="insurancePolicy != null">insurance_policy = #{insurancePolicy},</if>
+            <if test="contract != null">contract = #{contract},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="loanNum != null">loan_num = #{loanNum},</if>
+            <if test="investmentCost != null">investment_cost = #{investmentCost},</if>
+            <if test="cattleNum != null">cattle_num = #{cattleNum},</if>
+            <if test="insurancePolicyPath != null">insurance_policy_path = #{insurancePolicyPath},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteYyglResidentUserById" parameterType="String">
+        delete from yygl_resident_user where id = #{id}
+    </delete>
+
+    <delete id="deleteYyglResidentUserByIds" parameterType="String">
+        delete from yygl_resident_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 104 - 0
mybusiness/src/main/resources/mapper/salesArchives/SyglSalesArchivesMapper.xml

@@ -0,0 +1,104 @@
+<?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.business.zhnc.salesArchives.mapper.SyglSalesArchivesMapper">
+    
+    <resultMap type="SyglSalesArchives" id="SyglSalesArchivesResult">
+        <result property="id"    column="id"    />
+        <result property="batch"    column="batch"    />
+        <result property="salesLine"    column="sales_line"    />
+        <result property="salesAmount"    column="sales_amount"    />
+        <result property="shippingTime"    column="shipping_time"    />
+        <result property="shippingPersonnel"    column="shipping_personnel"    />
+        <result property="loader"    column="loader"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglSalesArchivesVo">
+        select id, batch, sales_line, sales_amount, shipping_time, shipping_personnel, loader, create_time, update_time, create_by, update_by, remark from sygl_sales_archives
+    </sql>
+
+    <select id="selectSyglSalesArchivesList" parameterType="SyglSalesArchives" resultMap="SyglSalesArchivesResult">
+        <include refid="selectSyglSalesArchivesVo"/>
+        <where>  
+            <if test="batch != null  and batch != ''"> and batch = #{batch}</if>
+            <if test="salesLine != null  and salesLine != ''"> and sales_line = #{salesLine}</if>
+            <if test="salesAmount != null  and salesAmount != ''"> and sales_amount = #{salesAmount}</if>
+            <if test="shippingTime != null "> and shipping_time = #{shippingTime}</if>
+            <if test="shippingPersonnel != null  and shippingPersonnel != ''"> and shipping_personnel = #{shippingPersonnel}</if>
+            <if test="loader != null  and loader != ''"> and loader = #{loader}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglSalesArchivesById" parameterType="String" resultMap="SyglSalesArchivesResult">
+        <include refid="selectSyglSalesArchivesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglSalesArchives" parameterType="SyglSalesArchives">
+        insert into sygl_sales_archives
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="batch != null">batch,</if>
+            <if test="salesLine != null">sales_line,</if>
+            <if test="salesAmount != null">sales_amount,</if>
+            <if test="shippingTime != null">shipping_time,</if>
+            <if test="shippingPersonnel != null">shipping_personnel,</if>
+            <if test="loader != null">loader,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="batch != null">#{batch},</if>
+            <if test="salesLine != null">#{salesLine},</if>
+            <if test="salesAmount != null">#{salesAmount},</if>
+            <if test="shippingTime != null">#{shippingTime},</if>
+            <if test="shippingPersonnel != null">#{shippingPersonnel},</if>
+            <if test="loader != null">#{loader},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglSalesArchives" parameterType="SyglSalesArchives">
+        update sygl_sales_archives
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="batch != null">batch = #{batch},</if>
+            <if test="salesLine != null">sales_line = #{salesLine},</if>
+            <if test="salesAmount != null">sales_amount = #{salesAmount},</if>
+            <if test="shippingTime != null">shipping_time = #{shippingTime},</if>
+            <if test="shippingPersonnel != null">shipping_personnel = #{shippingPersonnel},</if>
+            <if test="loader != null">loader = #{loader},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglSalesArchivesById" parameterType="String">
+        delete from sygl_sales_archives where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglSalesArchivesByIds" parameterType="String">
+        delete from sygl_sales_archives where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 99 - 0
mybusiness/src/main/resources/mapper/staffInfo/SyglStaffInfoMapper.xml

@@ -0,0 +1,99 @@
+<?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.business.zhnc.staffInfo.mapper.SyglStaffInfoMapper">
+    
+    <resultMap type="SyglStaffInfo" id="SyglStaffInfoResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="address"    column="address"    />
+        <result property="phone"    column="phone"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSyglStaffInfoVo">
+        select id, name, sex, id_card, address, phone, create_time, update_time, create_by, update_by, remark from sygl_staff_info
+    </sql>
+
+    <select id="selectSyglStaffInfoList" parameterType="SyglStaffInfo" resultMap="SyglStaffInfoResult">
+        <include refid="selectSyglStaffInfoVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+        </where>
+    </select>
+    
+    <select id="selectSyglStaffInfoById" parameterType="String" resultMap="SyglStaffInfoResult">
+        <include refid="selectSyglStaffInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSyglStaffInfo" parameterType="SyglStaffInfo">
+        insert into sygl_staff_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="address != null">address,</if>
+            <if test="phone != null">phone,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="address != null">#{address},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSyglStaffInfo" parameterType="SyglStaffInfo">
+        update sygl_staff_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSyglStaffInfoById" parameterType="String">
+        delete from sygl_staff_info where id = #{id}
+    </delete>
+
+    <delete id="deleteSyglStaffInfoByIds" parameterType="String">
+        delete from sygl_staff_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

文件差异内容过多而无法显示
+ 2589 - 0
mybusiness/src/main/resources/templates/bigData/bigData.html


+ 73 - 0
mybusiness/src/main/resources/templates/cattleFarm/farm/add.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增养殖信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-farm-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">级别:</label>
+                <div class="col-sm-8">
+                    <input name="level" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">牛场名称:</label>
+                <div class="col-sm-8">
+                    <input name="name" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="code" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">负责人:</label>
+                <div class="col-sm-8">
+                    <input name="responsiblePerson" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">维度:</label>
+                <div class="col-sm-8">
+                    <input name="latitude" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">经度:</label>
+                <div class="col-sm-8">
+                    <input name="longitude" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">联系电话:</label>
+                <div class="col-sm-8">
+                    <input name="phone" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">简介:</label>
+                <div class="col-sm-8">
+                    <input name="synopsis" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cattleFarm/farm"
+        $("#form-farm-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-farm-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 74 - 0
mybusiness/src/main/resources/templates/cattleFarm/farm/edit.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改牛场信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-farm-edit" th:object="${syglCattleFarm}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">级别:</label>
+                <div class="col-sm-8">
+                    <input name="level" th:field="*{level}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛场名称:</label>
+                <div class="col-sm-8">
+                    <input name="name" th:field="*{name}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="code" th:field="*{code}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">负责人:</label>
+                <div class="col-sm-8">
+                    <input name="responsiblePerson" th:field="*{responsiblePerson}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">维度:</label>
+                <div class="col-sm-8">
+                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经度:</label>
+                <div class="col-sm-8">
+                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话:</label>
+                <div class="col-sm-8">
+                    <input name="phone" th:field="*{phone}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">简介:</label>
+                <div class="col-sm-8">
+                    <input name="synopsis" th:field="*{synopsis}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cattleFarm/farm";
+        $("#form-farm-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-farm-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 134 - 0
mybusiness/src/main/resources/templates/cattleFarm/farm/farm.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('牛场信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>级别:</label>
+                                <input type="text" name="level"/>
+                            </li>
+                            <li>
+                                <label>牛场名称:</label>
+                                <input type="text" name="name"/>
+                            </li>
+                            <li>
+                                <label>编号:</label>
+                                <input type="text" name="code"/>
+                            </li>
+                            <li>
+                                <label>负责人:</label>
+                                <input type="text" name="responsiblePerson"/>
+                            </li>
+                            <li>
+                                <label>维度:</label>
+                                <input type="text" name="latitude"/>
+                            </li>
+                            <li>
+                                <label>经度:</label>
+                                <input type="text" name="longitude"/>
+                            </li>
+                            <li>
+                                <label>联系电话:</label>
+                                <input type="text" name="phone"/>
+                            </li>
+                            <li>
+                                <label>简介:</label>
+                                <input type="text" name="synopsis"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="cattleFarm:farm:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="cattleFarm:farm:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="cattleFarm:farm:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="cattleFarm:farm:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('cattleFarm:farm:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('cattleFarm:farm:remove')}]];
+        var prefix = ctx + "cattleFarm/farm";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "牛场信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'null',
+                    visible: false
+                },
+                {
+                    field: 'level',
+                    title: '级别'
+                },
+                {
+                    field: 'name',
+                    title: '牛场名称'
+                },
+                {
+                    field: 'code',
+                    title: '编号'
+                },
+                {
+                    field: 'responsiblePerson',
+                    title: '负责人'
+                },
+                {
+                    field: 'phone',
+                    title: '联系电话'
+                },
+                {
+                    field: 'synopsis',
+                    title: '简介'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

+ 51 - 0
mybusiness/src/main/resources/templates/cattleGrowRecord/record/add.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增牛只成长记录')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛只编号:</label>
+                <div class="col-sm-8">
+                    <select name="cattleId" class="form-control m-b" >
+                        <option th:each="zhnc : ${list}" th:text="${zhnc.no}" th:value="${zhnc.no}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">年龄:</label>
+                <div class="col-sm-8">
+                    <input name="age" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体重:</label>
+                <div class="col-sm-8">
+                    <input name="weight" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温:</label>
+                <div class="col-sm-8">
+                    <input name="temperature" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cattleGrowRecord/record"
+        $("#form-record-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-record-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 52 - 0
mybusiness/src/main/resources/templates/cattleGrowRecord/record/edit.html

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改牛只成长记录')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record-edit" th:object="${syglCattleGrowRecord}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛只编号:</label>
+                <div class="col-sm-8">
+                    <select name="cattleId" class="form-control m-b" >
+                        <option th:each="zhnc : ${list}" th:text="${zhnc.no}" th:value="${zhnc.no}" th:field="*{cattleId}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">年龄:</label>
+                <div class="col-sm-8">
+                    <input name="age" th:field="*{age}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体重:</label>
+                <div class="col-sm-8">
+                    <input name="weight" th:field="*{weight}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温:</label>
+                <div class="col-sm-8">
+                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cattleGrowRecord/record";
+        $("#form-record-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-record-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 110 - 0
mybusiness/src/main/resources/templates/cattleGrowRecord/record/record.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('牛只成长记录列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>牛只编号:</label>
+                                <input type="text" name="cattleId"/>
+                            </li>
+                            <li>
+                                <label>年龄:</label>
+                                <input type="text" name="age"/>
+                            </li>
+                            <li>
+                                <label>体重:</label>
+                                <input type="text" name="weight"/>
+                            </li>
+                            <li>
+                                <label>体温:</label>
+                                <input type="text" name="temperature"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="cattleGrowRecord:record:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="cattleGrowRecord:record:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="cattleGrowRecord:record:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="cattleGrowRecord:record:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('cattleGrowRecord:record:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('cattleGrowRecord:record:remove')}]];
+        var prefix = ctx + "cattleGrowRecord/record";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "牛只成长记录",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'null',
+                    visible: false
+                },
+                {
+                    field: 'cattleId',
+                    title: '牛只编号'
+                },
+                {
+                    field: 'age',
+                    title: '年龄'
+                },
+                {
+                    field: 'weight',
+                    title: '体重'
+                },
+                {
+                    field: 'temperature',
+                    title: '体温'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

+ 188 - 0
mybusiness/src/main/resources/templates/cattleInfo/info/add.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增牛只信息管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="no" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否被认养:</label>
+                <div class="col-sm-8">
+                    <select name="isAdopt" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否入住牛只:</label>
+                <div class="col-sm-8">
+                    <select name="isCheckin" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否种牛:</label>
+                <div class="col-sm-8">
+                    <select name="isCattle" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否出栏:</label>
+                <div class="col-sm-8">
+                    <select name="isChulan" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">初始体重:</label>
+                <div class="col-sm-8">
+                    <input name="initialWeight" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">品种:</label>
+                <div class="col-sm-8">
+                    <input name="variety" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">入社月龄:</label>
+                <div class="col-sm-8">
+                    <input name="monthAge" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">养殖开始时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="startTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">预计出舍时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="deliveryTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">屠宰时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="slaughterTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">生长周期:</label>
+                <div class="col-sm-8">
+                    <input name="growthCycle" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">养殖状态:</label>
+                <div class="col-sm-8">
+                    <select name="status" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">设备码:</label>
+                <div class="col-sm-8">
+                    <input name="code" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">溯源二维码:</label>
+                <div class="col-sm-8">
+                    <input name="qrCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">采购成本:</label>
+                <div class="col-sm-8">
+                    <input name="purchaseCost" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">图片附件:</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="filePath">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="jlrdFileObject" name="file" type="file" multiple>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+    <script th:inline="javascript">
+        var fileP="";//附件用
+        var fileRealP="";//真实的文件名uuid
+        var prefix = ctx + "cattleInfo/info"
+        $("#form-info-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $("input[name='filePath']").val(fileP);
+                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+            }
+        }
+
+        $("input[name='startTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='deliveryTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='slaughterTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+        //附件用通用方法,只需要更改控制文件格式即可
+        $(".file-upload").fileinput({
+            uploadUrl: ctx+'/common/upload',
+            maxFileCount: 6,
+            uploadAsync: true,
+            allowedFileExtensions: ['pdf','docx','doc','png','jpg','jpeg'],
+            autoReplace: true,
+            enctype: 'multipart/form-data'
+        }).on('fileuploaded', function (event, data, previewId, index) {
+            $("input[name='" + event.currentTarget.id + "']").val(data.response.url);
+            fileP += data.response.fileName+",";
+        }).on('fileremoved', function (event, id, index) {
+            $("input[name='" + event.currentTarget.id + "']").val('')
+        })
+    </script>
+</body>
+</html>

+ 312 - 0
mybusiness/src/main/resources/templates/cattleInfo/info/edit.html

@@ -0,0 +1,312 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改牛只信息管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-edit" th:object="${syglCattleInfo}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="no" th:field="*{no}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否被认养:</label>
+                <div class="col-sm-8">
+                    <select name="isAdopt" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isAdopt}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否入住牛只:</label>
+                <div class="col-sm-8">
+                    <select name="isCheckin" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isCheckin}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否种牛:</label>
+                <div class="col-sm-8">
+                    <select name="isCattle" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isCattle}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否出栏:</label>
+                <div class="col-sm-8">
+                    <select name="isChulan" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isChulan}"></option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">初始体重:</label>
+                <div class="col-sm-8">
+                    <input name="initialWeight" th:field="*{initialWeight}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">品种:</label>
+                <div class="col-sm-8">
+                    <input name="variety" th:field="*{variety}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">入社月龄:</label>
+                <div class="col-sm-8">
+                    <input name="monthAge" th:field="*{monthAge}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">养殖开始时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="startTime" th:value="${#dates.format(syglCattleInfo.startTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">预计出舍时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="deliveryTime" th:value="${#dates.format(syglCattleInfo.deliveryTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">屠宰时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="slaughterTime" th:value="${#dates.format(syglCattleInfo.slaughterTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">生长周期:</label>
+                <div class="col-sm-8">
+                    <input name="growthCycle" th:field="*{growthCycle}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">养殖状态:</label>
+                <div class="col-sm-8">
+                    <select name="status" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{status}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">设备码:</label>
+                <div class="col-sm-8">
+                    <input name="code" th:field="*{code}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">溯源二维码:</label>
+                <div class="col-sm-8">
+                    <input name="qrCode" th:field="*{qrCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">采购成本:</label>
+                <div class="col-sm-8">
+                    <input name="purchaseCost" th:field="*{purchaseCost}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">图片附件:</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="filePath" th:field="*{filePath}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="jlrdFileObject" name="file" type="file" multiple onclick="getMeg()">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+    <script th:inline="javascript">
+        var local = window.location.href.substring(0,window.location.href.indexOf(window.location.pathname));//附件用,获取网址
+        var fileP=$("input[name='schoolPic']").val();
+        var prefix = ctx + "cattleInfo/info";
+        $("#form-info-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $("input[name='filePath']").val(getImgUrl());//附件用
+                $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+            }
+        }
+
+        $("input[name='startTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='deliveryTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='slaughterTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        //f附件用,通用,只需要更改文件参数===============Start
+        var newFilePs = []; //图片回显
+        var imgConfig = []; //预览参数
+        var uploadImageArray = [];//所有已上传的图片路径
+
+        var urlsArr = ($("input[name='filePath']").val()).split(",");
+        for(var i in urlsArr) {
+            if (urlsArr[i] != "") {
+                uploadImageArray.push(urlsArr[i]);
+                newFilePs[i] = ctx + urlsArr[i];
+                var fileType = urlsArr[i].substr(urlsArr[i].lastIndexOf(".")+1,urlsArr[i].length-1);
+                var ftype ="image"; //文件类型
+                if(fileType=="pdf"){
+                    ftype = "pdf";
+                }
+                imgConfig[i] = {
+                    url: ctx+"/common/removeFile",
+                    downloadUrl:ctx+urlsArr[i], //下载路径,此项不设置的话下载按钮不显示
+                    type:ftype,             //文件类型
+                    key: urlsArr[i],        //参数,用于文件删除向后台传参
+                    caption:urlsArr[i].substr(urlsArr[i].lastIndexOf("/")+1,urlsArr[i].length-1)    //文件名,用于预览文件显示的文件名
+                };
+            }
+        }
+
+
+        $(".file-upload").each(function (i) {
+            console.log(imgConfig);
+            $(this).fileinput({
+                language: 'zh', //设置语言
+                uploadUrl: ctx+'/common/upload',
+                deleteUrl:ctx+'/common/removeFile',
+                allowedFileExtensions: ['jpg', 'png','pdf','docx','xlsx','doc','xls'],//接收的文件后缀
+//                allowedFileExtensions: ['jpg', 'png','pdf','docx','xlsx','doc','xls'],//接收的文件后缀
+                showUpload: false, //是否显示上传按钮
+                showRemove: false, //显示移除按钮
+                showPreview: true, //是否显示预览
+                showCaption: false,//是否显示标题
+                browseClass: "btn btn-primary", //按钮样式
+                dropZoneEnabled: true,//是否显示拖拽区域
+                initialPreviewAsData: true,
+                enctype: 'multipart/form-data',
+                initialPreview: newFilePs,
+//                initialPreviewFileType: ['pdf','image'],
+                uploadAsync: true, //默认异步上传(true),回调fileuploaded,false为同步上传,回调filebatchuploadsuccess
+                maxFileCount: 6,
+                overwriteInitial: false,    //不覆盖已存在的图片
+                initialPreviewConfig: imgConfig, //配置预览的参数
+                autoReplace: true,
+                preferIconicPreview: true,// 强制缩略图显示以下文件扩展名的图标
+                previewFileIconSettings: {
+                    'doc': '<i class="fa fa-file-word-o text-primary"></i>',
+                    'xls': '<i class="fa fa-file-excel-o text-success"></i>',
+                    'ppt': '<i class="fa fa-file-powerpoint-o text-danger"></i>',
+                    'zip': '<i class="fa fa-file-archive-o text-muted"></i>',
+                    'htm': '<i class="fa fa-file-code-o text-info"></i>',
+                    'txt': '<i class="fa fa-file-text-o text-info"></i>',
+                    'mov': '<i class="fa fa-file-movie-o text-warning"></i>',
+                    'mp3': '<i class="fa fa-file-audio-o text-warning"></i>',
+                },
+                previewFileExtSettings: { // configure the logic for determining icon file extensions
+                    'doc': function(ext) {
+                        return ext.match(/(doc|docx)$/i);
+                    },
+                    'xls': function(ext) {
+                        return ext.match(/(xls|xlsx)$/i);
+                    },
+                    'ppt': function(ext) {
+                        return ext.match(/(ppt|pptx)$/i);
+                    },
+                    'zip': function(ext) {
+                        return ext.match(/(zip|rar|tar|gzip|gz|7z)$/i);
+                    },
+                    'htm': function(ext) {
+                        return ext.match(/(htm|html)$/i);
+                    },
+                    'txt': function(ext) {
+                        return ext.match(/(txt|ini|csv|java|php|js|css)$/i);
+                    },
+                    'mov': function(ext) {
+                        return ext.match(/(avi|mpg|mkv|mov|mp4|3gp|webm|wmv)$/i);
+                    },
+                    'mp3': function(ext) {
+                        return ext.match(/(mp3|wav)$/i);
+                    }
+                }
+            }).on('fileuploaded', function (event, data, previewId, index) {
+                fileP += data.response.fileName+",";
+                $('#zoom-'+previewId).find(".kv-preview-data").attr("src",data.response.fileName);//上传成功后替换文件路径(替换为实际数据库的存储路径)
+
+            }).on("filebatchselected", function (event, previewId, files) {//选中文件后执行
+                $(".file-upload").fileinput("upload");
+            }).on('fileremoved', function (event, id, index) {//预览时点击缩略图上的删除按钮才能触发的
+                console.log('fileremoved');
+                getMeg();
+            }).on("filepredelete", function (event, key, jqXHR, data) {   //预览图片删除
+                console.log('filepredelete')
+                getMeg();
+            }).on("filesuccessremove", function (event, id) {   //使用缩略图删除按钮删除成功上传的缩略图后
+                console.log('filesuccessremove')
+                getMeg();
+            })
+            $(this).fileinput('_initFileActions');
+        });
+
+        function nowImgTotal() {
+            return $(".file-preview-thumbnails").find('.file-preview-frame').length / 2;
+        }
+
+        function getMeg() {
+            if (nowImgTotal() >= 6) {
+//                console.log('file set disabled');
+                $('#jlrdFileObject').attr('disabled', 'disabled');
+                $.modal.alert("图片允许上传的最大数值为6,请删除需要被替换的图片后再进行上传操作!")
+                return false;
+            }else{
+//                console.log('file set null');
+                $('#jlrdFileObject').removeAttr("disabled");
+            }
+        }
+
+        /*
+            获取当前页面图片附件的存储路径
+         */
+        function getImgUrl(){
+            var initFileDiv = $(".kv-zoom-cache");
+            var imgUrl = [];
+            initFileDiv.each(function(i,e){
+                var fullPath = $(this).find(".kv-preview-data").attr("src");
+                if(fullPath.length>=2)
+                    imgUrl[i]="/profile/upload/"+(fullPath.split("upload/",fullPath.length-1))[1];
+            });
+            return imgUrl;
+        }
+        //f附件用,通用,只需要更改文件参数===============End
+    </script>
+</body>
+</html>

+ 177 - 0
mybusiness/src/main/resources/templates/cattleInfo/info/info.html

@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('牛只信息管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>编号:</label>
+                                <input type="text" name="no"/>
+                            </li>
+                            <li>
+                                <label>是否被认养:</label>
+                                <select name="isAdopt" th:with="type=${@dict.getType('sys_yes_no')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>是否入住牛:</label>
+                                <select name="isCheckin" th:with="type=${@dict.getType('sys_yes_no')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>是否种牛:</label>
+                                <select name="isCattle" th:with="type=${@dict.getType('sys_yes_no')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>是否出栏:</label>
+                                <select name="isChulan" th:with="type=${@dict.getType('sys_yes_no')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <label style="width: 100px;">养殖开始时间:</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginStartTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="cattleInfo:info:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="cattleInfo:info:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="cattleInfo:info:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="cattleInfo:info:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('cattleInfo:info:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('cattleInfo:info:remove')}]];
+        var SYS_YES_NO = [[${@dict.getType('sys_yes_no')}]];
+        var prefix = ctx + "cattleInfo/info";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "牛只信息管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'null',
+                    visible: false
+                },
+                {
+                    field: 'no',
+                    title: '编号'
+                },
+                {
+                    field: 'isAdopt',
+                    title: '是否被认养',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(SYS_YES_NO, value);
+                    }
+                },
+                {
+                    field: 'isCheckin',
+                    title: '是否入住牛只',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(SYS_YES_NO, value);
+                    }
+                },
+                {
+                    field: 'isCattle',
+                    title: '是否种牛',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(SYS_YES_NO, value);
+                    }
+                },
+                {
+                    field: 'variety',
+                    title: '品种'
+                },
+                {
+                    field: 'monthAge',
+                    title: '入社月龄'
+                },
+                {
+                    field: 'startTime',
+                    title: '养殖开始时间'
+                },
+                {
+                    field: 'deliveryTime',
+                    title: '预计出舍时间'
+                },
+                {
+                    field: 'isChulan',
+                    title: '是否出栏',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(SYS_YES_NO, value);
+                    }
+                },
+                {
+                    field: 'slaughterTime',
+                    title: '屠宰时间'
+                },
+                {
+                    field: 'code',
+                    title: '设备码'
+                },
+                {
+                    field: 'purchaseCost',
+                    title: '采购成本'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

+ 57 - 0
mybusiness/src/main/resources/templates/cowshedInfo/info/add.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增牛舍信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">名称:</label>
+                <div class="col-sm-8">
+                    <input name="name" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="code" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">容纳数据量:</label>
+                <div class="col-sm-8">
+                    <input name="accommodateNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">品种:</label>
+                <div class="col-sm-8">
+                    <input name="varieties" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属养殖:</label>
+                <div class="col-sm-8">
+                    <select name="cattleFarmId" class="form-control m-b" >
+                        <option th:each="zhnc : ${list}" th:text="${zhnc.name}" th:value="${zhnc.id}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cowshedInfo/info"
+        $("#form-info-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 58 - 0
mybusiness/src/main/resources/templates/cowshedInfo/info/edit.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改牛舍信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-edit" th:object="${syglCowshedInfo}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">名称:</label>
+                <div class="col-sm-8">
+                    <input name="name" th:field="*{name}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">编号:</label>
+                <div class="col-sm-8">
+                    <input name="code" th:field="*{code}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">容纳数据量:</label>
+                <div class="col-sm-8">
+                    <input name="accommodateNum" th:field="*{accommodateNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">品种:</label>
+                <div class="col-sm-8">
+                    <input name="varieties" th:field="*{varieties}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">所属养殖:</label>
+                <div class="col-sm-8">
+                    <select name="cattleFarmId" class="form-control m-b" >
+                        <option th:each="zhnc : ${list}" th:text="${zhnc.name}" th:value="${zhnc.id}" th:field="*{cattleFarmId}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "cowshedInfo/info";
+        $("#form-info-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

+ 110 - 0
mybusiness/src/main/resources/templates/cowshedInfo/info/info.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('牛舍信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>名称:</label>
+                                <input type="text" name="name"/>
+                            </li>
+                            <li>
+                                <label>编号:</label>
+                                <input type="text" name="code"/>
+                            </li>
+                            <li>
+                                <label>容纳数据量:</label>
+                                <input type="text" name="accommodateNum"/>
+                            </li>
+                            <li>
+                                <label>品种:</label>
+                                <input type="text" name="varieties"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="cowshedInfo:info:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="cowshedInfo:info:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="cowshedInfo:info:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="cowshedInfo:info:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('cowshedInfo:info:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('cowshedInfo:info:remove')}]];
+        var prefix = ctx + "cowshedInfo/info";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "牛舍信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'null',
+                    visible: false
+                },
+                {
+                    field: 'name',
+                    title: '名称'
+                },
+                {
+                    field: 'code',
+                    title: '编号'
+                },
+                {
+                    field: 'accommodateNum',
+                    title: '容纳数据量'
+                },
+                {
+                    field: 'varieties',
+                    title: '品种'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

+ 89 - 0
mybusiness/src/main/resources/templates/diseaseArchives/archives/add.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增疾病档案')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-archives-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛只编号:</label>
+                <div class="col-sm-8">
+                    <input name="cattleNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">疫病名称:</label>
+                <div class="col-sm-8">
+                    <input name="diseaseName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">治疗人员:</label>
+                <div class="col-sm-8">
+                    <input name="treatPersonnel" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资料方案:</label>
+                <div class="col-sm-8">
+                    <input name="treatPlan" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">救治开始时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="startTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">救治结束时间:</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="endTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">救治状态:</label>
+                <div class="col-sm-8">
+                    <select name="treatStart" class="form-control m-b" th:with="type=${@dict.getType('zhnc_jz_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "diseaseArchives/archives"
+        $("#form-archives-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-archives-add').serialize());
+            }
+        }
+
+        $("input[name='startTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='endTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

+ 146 - 0
mybusiness/src/main/resources/templates/diseaseArchives/archives/archives.html

@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('疾病档案列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>牛只编号:</label>
+                                <input type="text" name="cattleNo"/>
+                            </li>
+                            <li>
+                                <label>疫病名称:</label>
+                                <input type="text" name="diseaseName"/>
+                            </li>
+                            <li>
+                                <label>治疗人员:</label>
+                                <input type="text" name="treatPersonnel"/>
+                            </li>
+                            <li>
+                                <label>资料方案:</label>
+                                <input type="text" name="treatPlan"/>
+                            </li>
+                            <li class="select-time">
+                                <label style="width: 100px;">救治开始时间:</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginStartTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartTime]"/>
+                            </li>
+                            <li class="select-time">
+                                <label style="width: 100px;">救治结束时间:</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEndTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEndTime]"/>
+                            </li>
+                            <li>
+                                <label>救治状态:</label>
+                                <div class="col-sm-8">
+                                    <select name="treatStart" class="form-control m-b" th:with="type=${@dict.getType('zhnc_jz_status')}">
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    </select>
+                                </div>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="diseaseArchives:archives:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="diseaseArchives:archives:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="diseaseArchives:archives:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="diseaseArchives:archives:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('diseaseArchives:archives:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('diseaseArchives:archives:remove')}]];
+        var ZHNC_JZ_STATUS = [[${@dict.getType('zhnc_jz_status')}]];
+        var prefix = ctx + "diseaseArchives/archives";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "疾病档案",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'null',
+                    visible: false
+                },
+                {
+                    field: 'cattleNo',
+                    title: '牛只编号'
+                },
+                {
+                    field: 'diseaseName',
+                    title: '疫病名称'
+                },
+                {
+                    field: 'treatPersonnel',
+                    title: '治疗人员'
+                },
+                {
+                    field: 'treatPlan',
+                    title: '资料方案'
+                },
+                {
+                    field: 'startTime',
+                    title: '救治开始时间'
+                },
+                {
+                    field: 'endTime',
+                    title: '救治结束时间'
+                },
+                {
+                    field: 'treatStart',
+                    title: '救治状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(ZHNC_JZ_STATUS, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

+ 0 - 0
mybusiness/src/main/resources/templates/diseaseArchives/archives/edit.html


部分文件因为文件数量过多而无法显示