新建并完成查询PSY

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/HuimvHyAutoGetDataApplication.java

@@ -0,0 +1,19 @@
+package com.huimv.production.autoGetData;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootApplication
+public class HuimvHyAutoGetDataApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(HuimvHyAutoGetDataApplication.class, args);
+    }
+}

huimv-hy-production/huimv.hy.autoGetData/src/main/resources/application-dev.yml

@@ -0,0 +1,31 @@
+server:
+  port: 9105
+spring:
+  application:
+    name: huimv-hy-autoGetData
+
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_breed_video?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+    #  redis:
+#    database: 0
+#    host: 119.3.84.55
+#    port: 6379
+#    password: hm123456
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    timeout: 5000

huimv-hy-production/huimv.hy.autoGetData/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.profiles.active=dev

huimv-hy-production/huimv.hy.erp.datasource/pom.xml

@@ -11,5 +11,12 @@
 
     <artifactId>huimv.hy.erp.datasource</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>4.0</version>
+        </dependency>
+    </dependencies>
 
 </project>

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/HuimvHyProductionDatasource.java

@@ -0,0 +1,19 @@
+package com.huimv.production.datasource;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootApplication
+public class HuimvHyProductionDatasource {
+    public static void main(String[] args) {
+        SpringApplication.run(HuimvHyProductionDatasource.class, args);
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/configuration/SqlServerDialect.java

@@ -0,0 +1,28 @@
+package com.huimv.production.datasource.configuration;
+
+import org.hibernate.dialect.SQLServer2012Dialect;
+import org.hibernate.type.StandardBasicTypes;
+
+import java.sql.Types;
+
+/**
+ * @Project : huimv
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class SqlServerDialect extends SQLServer2012Dialect {
+    /**
+     * 设置sql server 数据库方言转换
+     */
+    public SqlServerDialect() {
+        registerHibernateType(Types.NCHAR, StandardBasicTypes.CHARACTER.getName());
+        registerHibernateType(Types.NCHAR, 1, StandardBasicTypes.CHARACTER.getName());
+        registerHibernateType(Types.NCHAR, 255, StandardBasicTypes.STRING.getName());
+        registerHibernateType(Types.NVARCHAR, StandardBasicTypes.STRING.getName());
+        registerHibernateType(Types.LONGNVARCHAR, StandardBasicTypes.TEXT.getName());
+        registerHibernateType(Types.NCLOB, StandardBasicTypes.CLOB.getName());
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/configuration/UpperTableStrategy.java

@@ -0,0 +1,22 @@
+package com.huimv.production.datasource.configuration;
+
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class UpperTableStrategy extends PhysicalNamingStrategyStandardImpl {
+    @Override
+    public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment context) {
+        // 将表名全部转换成大写
+        String tableName = name.getText().toUpperCase();
+        return Identifier.toIdentifier(tableName);
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -0,0 +1,55 @@
+package com.huimv.production.datasource.controller;
+
+import com.huimv.production.datasource.service.IErpDataService;
+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;
+
+/**
+ * @Project :
+ * @Package : com.huimv.production.datasource.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RestController
+@RequestMapping(value = "/ErpData",method=RequestMethod.GET)
+public class ErpDataController {
+
+    @Autowired
+    private IErpDataService erpDataService;
+
+    /**
+     * @Method      : getPsy
+     * @Description : 
+     * @Params      : []
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/5/14       
+     * @Time        : 20:57
+     */
+    @RequestMapping("/getPsy")
+    public String getPsy(){
+        return erpDataService.getPsy();
+    }
+
+    /**
+     * @Method      : getReEstrusRate
+     * @Description : 返情率
+     * @Params      : []
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/5/14       
+     * @Time        : 21:14
+     */
+    @RequestMapping("getReEstrusRate")
+    public String getReEstrusRate(){
+        return "";
+    }
+
+
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/entity/TDeliveryEntity.java

@@ -0,0 +1,226 @@
+package com.huimv.production.datasource.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "TDelivery")
+public class TDeliveryEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "FID", nullable = false)
+    private String FID;
+
+    @Column(name = "FLOGSOURCEE")
+    private Integer FLOGSOURCEE;
+
+    @Column(name = "FDATEDELIVERY")
+    private Timestamp FDATEDELIVERY;
+
+    @Column(name = "PIGHOUSEDID")
+    private String PIGHOUSEDID;
+
+    @Column(name = "FNUMBER")
+    private String FNUMBER;
+
+    @Column(name = "FDATEPREJUDGE")
+    private Timestamp FDATEPREJUDGE;
+
+    @Column(name = "FREMARKSTR")
+    private String FREMARKSTR;
+
+    @Column(name = "FLOGSTATEE")
+    private Integer FLOGSTATEE;
+
+    @Column(name = "LISTERDID")
+    private String LISTERDID;
+
+    @Column(name = "TECHNICIANDID")
+    private String TECHNICIANDID;
+
+    @Column(name = "SOURCELOGDID")
+    private String SOURCELOGDID;
+
+    @Column(name = "FDATEAUDITING")
+    private Timestamp FDATEAUDITING;
+
+    @Column(name = "FDATECREATE")
+    private Timestamp FDATECREATE;
+
+    @Column(name = "ASSESSORDID")
+    private String ASSESSORDID;
+
+    @Column(name = "HOGPENDID")
+    private String HOGPENDID;
+
+    @Column(name = "FDATECHECKUP")
+    private Timestamp FDATECHECKUP;
+
+    @Column(name = "FBORNSTATECHECK")
+    private String FBORNSTATECHECK;
+
+    public void setFID(String FID) {
+        this.FID = FID;
+    }
+
+    public String getFID() {
+        return FID;
+    }
+
+    public void setFLOGSOURCEE(Integer FLOGSOURCEE) {
+        this.FLOGSOURCEE = FLOGSOURCEE;
+    }
+
+    public Integer getFLOGSOURCEE() {
+        return FLOGSOURCEE;
+    }
+
+    public void setFDATEDELIVERY(Timestamp FDATEDELIVERY) {
+        this.FDATEDELIVERY = FDATEDELIVERY;
+    }
+
+    public Timestamp getFDATEDELIVERY() {
+        return FDATEDELIVERY;
+    }
+
+    public void setPIGHOUSEDID(String PIGHOUSEDID) {
+        this.PIGHOUSEDID = PIGHOUSEDID;
+    }
+
+    public String getPIGHOUSEDID() {
+        return PIGHOUSEDID;
+    }
+
+    public void setFNUMBER(String FNUMBER) {
+        this.FNUMBER = FNUMBER;
+    }
+
+    public String getFNUMBER() {
+        return FNUMBER;
+    }
+
+    public void setFDATEPREJUDGE(Timestamp FDATEPREJUDGE) {
+        this.FDATEPREJUDGE = FDATEPREJUDGE;
+    }
+
+    public Timestamp getFDATEPREJUDGE() {
+        return FDATEPREJUDGE;
+    }
+
+    public void setFREMARKSTR(String FREMARKSTR) {
+        this.FREMARKSTR = FREMARKSTR;
+    }
+
+    public String getFREMARKSTR() {
+        return FREMARKSTR;
+    }
+
+    public void setFLOGSTATEE(Integer FLOGSTATEE) {
+        this.FLOGSTATEE = FLOGSTATEE;
+    }
+
+    public Integer getFLOGSTATEE() {
+        return FLOGSTATEE;
+    }
+
+    public void setLISTERDID(String LISTERDID) {
+        this.LISTERDID = LISTERDID;
+    }
+
+    public String getLISTERDID() {
+        return LISTERDID;
+    }
+
+    public void setTECHNICIANDID(String TECHNICIANDID) {
+        this.TECHNICIANDID = TECHNICIANDID;
+    }
+
+    public String getTECHNICIANDID() {
+        return TECHNICIANDID;
+    }
+
+    public void setSOURCELOGDID(String SOURCELOGDID) {
+        this.SOURCELOGDID = SOURCELOGDID;
+    }
+
+    public String getSOURCELOGDID() {
+        return SOURCELOGDID;
+    }
+
+    public void setFDATEAUDITING(Timestamp FDATEAUDITING) {
+        this.FDATEAUDITING = FDATEAUDITING;
+    }
+
+    public Timestamp getFDATEAUDITING() {
+        return FDATEAUDITING;
+    }
+
+    public void setFDATECREATE(Timestamp FDATECREATE) {
+        this.FDATECREATE = FDATECREATE;
+    }
+
+    public Timestamp getFDATECREATE() {
+        return FDATECREATE;
+    }
+
+    public void setASSESSORDID(String ASSESSORDID) {
+        this.ASSESSORDID = ASSESSORDID;
+    }
+
+    public String getASSESSORDID() {
+        return ASSESSORDID;
+    }
+
+    public void setHOGPENDID(String HOGPENDID) {
+        this.HOGPENDID = HOGPENDID;
+    }
+
+    public String getHOGPENDID() {
+        return HOGPENDID;
+    }
+
+    public void setFDATECHECKUP(Timestamp FDATECHECKUP) {
+        this.FDATECHECKUP = FDATECHECKUP;
+    }
+
+    public Timestamp getFDATECHECKUP() {
+        return FDATECHECKUP;
+    }
+
+    public void setFBORNSTATECHECK(String FBORNSTATECHECK) {
+        this.FBORNSTATECHECK = FBORNSTATECHECK;
+    }
+
+    public String getFBORNSTATECHECK() {
+        return FBORNSTATECHECK;
+    }
+
+    @Override
+    public String toString() {
+        return "TDeliveryEntity{" +
+                "FID=" + FID + '\'' +
+                "FLOGSOURCEE=" + FLOGSOURCEE + '\'' +
+                "FDATEDELIVERY=" + FDATEDELIVERY + '\'' +
+                "PIGHOUSEDID=" + PIGHOUSEDID + '\'' +
+                "FNUMBER=" + FNUMBER + '\'' +
+                "FDATEPREJUDGE=" + FDATEPREJUDGE + '\'' +
+                "FREMARKSTR=" + FREMARKSTR + '\'' +
+                "FLOGSTATEE=" + FLOGSTATEE + '\'' +
+                "LISTERDID=" + LISTERDID + '\'' +
+                "TECHNICIANDID=" + TECHNICIANDID + '\'' +
+                "SOURCELOGDID=" + SOURCELOGDID + '\'' +
+                "FDATEAUDITING=" + FDATEAUDITING + '\'' +
+                "FDATECREATE=" + FDATECREATE + '\'' +
+                "ASSESSORDID=" + ASSESSORDID + '\'' +
+                "HOGPENDID=" + HOGPENDID + '\'' +
+                "FDATECHECKUP=" + FDATECHECKUP + '\'' +
+                "FBORNSTATECHECK=" + FBORNSTATECHECK + '\'' +
+                '}';
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/repo/TDeliveryRepo.java

@@ -0,0 +1,32 @@
+package com.huimv.production.datasource.dao.repo;
+
+import com.huimv.production.datasource.dao.entity.TDeliveryEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, JpaSpecificationExecutor<TDeliveryEntity> {
+    @Query(nativeQuery = true,value = "select CAST(PJWCHZ*chl*NLYWS AS DEC(8,2)) AS 'PSY' from (select avg(TNewStru7743.FamountLiveInt*1.0) as 'PJWCHZ'" +
+            " from TDelivery left join TNewStru7743 on TNewStru7743.FDeliveryMainStruID=TDelivery.FID " +
+            " where TDelivery.FLogStatee in(3,4,6) and TDelivery.FDateDelivery between '2021-03-01' and '2021-03-09')PJWCHZ, " +
+            " (SELECT case WHEN zczc = 0 THEN 0 ELSE 1-sw/zczc END  as 'chl' from ( select count(TBornNewStru.Fid) as 'zczc' " +
+            "  from TBorn left join TBornNewStru on TBornNewStru.FBornMainStruID = TBorn.FID " +
+            "  where TBorn.FLOGSTATEE in (3,4,6) " +
+            "  and TBorn.FDATEBORN between  '2020-03-01' and '2021-03-09')cs,(select sum(isnull(TPigDieChild.FweakpigdieCount,0))+sum(isnull(TPigDieChild.Fpigdiecount,0)) as sw " +
+            " from TPigDie left join TPigDieChild on TPigDieChild.FPigDieMainStruID=TPigDie.FID " +
+            " where TPigDie.FBillState in(3,4,6) and TPigDieChild.FPigSex in(1,2,3) and FPIGSTATE=15 " +
+            " and (TPigDie.FDieDate BETWEEN  '2020-03-01' and '2021-03-09'))sw )chl,(select  CAST(365*1.0/avg(tjj) as dec(7,4)) as 'NLYWS' " +
+            " from " +
+            "  (SELECT " +
+            " case when isnull(TNewStru7743.FtyreDistance,0)!=0 then  TNewStru7743.FtyreDistance  end  as 'tjj' " +
+            " FROM TDelivery " +
+            " LEFT JOIN TNewStru7743  on TNewStru7743.FDeliveryMainStruID = TDelivery.FID " +
+            "  WHERE  TDelivery.FlogStateE in(3,4,6) " +
+            " And ( datediff(dd,'2020-03-01',TDelivery.FDATEDELIVERY)>=0 ) " +
+            " And (datediff(dd,'2021-03-04',TDelivery.FDATEDELIVERY)<=0 ) " +
+            " ) tmp_tbl " +
+            " having avg(tjj)>0)ncws ")
+    List<Object[]> getPsy();
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/IErpDataService.java

@@ -0,0 +1,6 @@
+package com.huimv.production.datasource.service;
+
+public interface IErpDataService {
+
+    String getPsy();
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.production.datasource.service.impl;
+
+import com.huimv.production.datasource.dao.repo.TDeliveryRepo;
+import com.huimv.production.datasource.service.IErpDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+public class ErpDataServiceImpl implements IErpDataService {
+
+    @Autowired
+    private TDeliveryRepo tDeliveryRepo;
+
+    @Override
+    public String getPsy() {
+
+        List<Object[]> psyFieldList = tDeliveryRepo.getPsy();
+//        System.out.println("psyFieldList.size: "+psyFieldList.size());
+        String psy = "";
+        for (Object[] goodsObj : psyFieldList) {
+//            System.out.println("0:"+goodsObj[0]);
+            psy = goodsObj[0].toString();
+        }
+        return psy;
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/resources/application-dev.yml

@@ -0,0 +1,50 @@
+server:
+  port: 9100
+spring:
+  application:
+    name: huimv-hy-erp-datasource
+  datasource:
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://192.168.1.26:1433;DatabaseName=yz
+    username: sa
+    password: hm123456@
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 1
+    testWhileIdle: true
+    testOnBorrow: true
+    testOnReturn: true
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        default_schema: dbo
+    hibernate:
+      naming:
+        physical-strategy: com.huimv.production.datasource.configuration.UpperTableStrategy
+#    database-platform: com.huimv.production.datasource.configuration.SqlServerDialect # Error
+
+#  datasource:
+#    url: jdbc:sqlserver://localhost:1433;DatabaseName=test
+#    username: sa
+#    password: hm123456@
+#    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#  jpa:
+#    show-sql: true
+##    database: mysql
+#    database-platform: com.ford.configuration.SqlServerDialect
+#    open-in-view: true
+#    properties:
+#      hibernate:
+#        default_schema: dbo
+#        naming:
+#          physical-strategy: com.ford.configuration.UpperTableStrategy
+#    hibernate:
+#      ddl-auto: update
+

huimv-hy-production/huimv.hy.erp.datasource/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.profiles.active=dev

huimv-hy-production/pom.xml

@@ -17,7 +17,7 @@
     <artifactId>huimv-hy-production</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>huimv-hy-production</name>
-    <description>生产数据</description>
+    <description>青莲集团海盐牧场生产数据</description>
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -54,11 +54,11 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         <!-- alibaba的druid数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba</groupId>-->
+<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
+<!--            <version>1.2.2</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>