Bläddra i källkod

添加疾病管理部分接口

523096025 4 år sedan
förälder
incheckning
d6f42c72b7

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/controller/HealthImmuneRecordController.java

@@ -88,7 +88,7 @@ public class HealthImmuneRecordController {
      *  根据疫苗名称,小猪编号id(可批量)向免疫记录表中插入数据
      */
     @RequestMapping("/saveAll")
-    public R saveAll(Integer[] eartags, String vaccine, Integer farmId, String manName, Integer manId){
+    public R saveAll(String[] eartags, String vaccine, Integer farmId, String manName, Integer manId){
 
         healthImmuneRecordService.saveAll(eartags,vaccine,farmId,manName,manId);
 

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/HealthImmuneRecordEntity.java

@@ -30,7 +30,7 @@ public class HealthImmuneRecordEntity implements Serializable {
 	/**
 	 * 小猪编号
 	 */
-	private Integer pigId;
+	private String pigId;
 	/**
 	 * 牧场id
 	 */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/HealthIsolationRecordEntity.java

@@ -32,7 +32,7 @@ public class HealthIsolationRecordEntity implements Serializable {
 	/**
 	 * 小猪编号
 	 */
-	private Integer pigCode;
+	private String pigCode;
 	/**
 	 * 病历号
 	 */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/HealthMedicalRecordEntity.java

@@ -28,7 +28,7 @@ public class HealthMedicalRecordEntity implements Serializable {
 	/**
 	 * 内部编号
 	 */
-	private Integer pigId;
+	private String pigId;
 	/**
 	 * 疾病名称
 	 */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/service/HealthImmuneRecordService.java

@@ -18,6 +18,6 @@ public interface HealthImmuneRecordService extends IService<HealthImmuneRecordEn
 
     PageUtils queryPage(Map<String, Object> params);
 
-    void saveAll(Integer[] eartags, String vaccine, Integer farmId, String manName, Integer manId);
+    void saveAll(String[] eartags, String vaccine, Integer farmId, String manName, Integer manId);
 }
 

+ 2 - 2
huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthImmuneRecordServiceImpl.java

@@ -29,13 +29,13 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
     }
 
     @Override
-    public void saveAll(Integer[] eartags, String vaccine, Integer farmId, String manName, Integer manId) {
+    public void saveAll(String[] eartags, String vaccine, Integer farmId, String manName, Integer manId) {
         HealthImmuneRecordEntity healthImmuneRecordEntity = new HealthImmuneRecordEntity();
         healthImmuneRecordEntity.setFarmId(farmId);
         healthImmuneRecordEntity.setManId(manId);
         healthImmuneRecordEntity.setManName(manName);
         healthImmuneRecordEntity.setVaccineName(vaccine);
-        for (Integer eartag : eartags) {
+        for (String eartag : eartags) {
             healthImmuneRecordEntity.setPigId(eartag);
             save(healthImmuneRecordEntity);
         }

+ 1 - 1
renren-fast/src/main/java/io/renren/config/CorsConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@Configuration
+//@Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
     /*@Override

+ 2 - 2
renren-generator/src/main/resources/application.yml

@@ -7,9 +7,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/huimv_smart_mgt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv_smart_apiservice?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
-    password: root
+    password: hm123456
     #oracle配置
     #    driverClassName: oracle.jdbc.OracleDriver
     #    url: jdbc:oracle:thin:@47.100.206.162:1521:xe