lirl 3 年之前
父节点
当前提交
3c4dbeb02d

+ 16 - 0
src/main/java/com/steerinfo/ems/Utils/DateUtils.java

@@ -213,4 +213,20 @@ public class DateUtils {
         System.out.println(calendar.get(Calendar.MONTH));
         return calendar.get(Calendar.DAY_OF_MONTH) == 1;
     }
+    public static String getDate(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date dt = null;
+        String reStr = null;
+        try {
+            dt = sdf.parse(DateUtils.dateStr(new Date(),"yyyy-MM-dd"));
+            Calendar rightNow = Calendar.getInstance();
+            rightNow.setTime(dt);
+            rightNow.add(Calendar.DAY_OF_MONTH, -3);
+            Date dt1 = rightNow.getTime();
+             reStr = sdf.format(dt1);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return reStr ;
+    }
 }

+ 9 - 7
src/main/java/com/steerinfo/ems/tcm0318/mapper/TCm0318Mapper.java

@@ -3,6 +3,8 @@ package com.steerinfo.ems.tcm0318.mapper;
 import com.steerinfo.ems.tcm0318.model.TCm0318;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -21,19 +23,19 @@ public interface TCm0318Mapper extends IBaseMapper<TCm0318, String> {
     List<Map<String, Object>> datacomparison(Map<String, Object> parameters);
     List<TCm0318> getByCode(Map<String, Object> parameters);
     //获取炼钢数据
-    List<TCm0318> getDataAsLg();
+    List<TCm0318> getDataAsLg(@Param("date") String date);
     //获取冶炼厂数据
-    List<TCm0318> getDataAsYlc();
+    List<TCm0318> getDataAsYlc(@Param("date") String date);
     //获取一高线数据
-    List<TCm0318> getDataAsYgx();
+    List<TCm0318> getDataAsYgx(@Param("date") String date);
     //获取二高线数据
-    List<TCm0318> getDataAsEgx();
+    List<TCm0318> getDataAsEgx(@Param("date") String date);
     //获取发电厂数据
-    List<TCm0318> getDataAsFdc();
+    List<TCm0318> getDataAsFdc(@Param("date") String date);
     //获取机焦厂数据
-    List<TCm0318> getDataAsJjc();
+    List<TCm0318> getDataAsJjc(@Param("date") String date);
     //获取污水车间数据
-    List<TCm0318> getDataAsWscj();
+    List<TCm0318> getDataAsWscj(@Param("date") String date);
     //获取相对的数据
     TCm0318 selectByparams(TCm0318 tCm0318);
     //修改

+ 14 - 14
src/main/java/com/steerinfo/ems/tcm0318/mapper/TCm0318Mapper.xml

@@ -295,7 +295,7 @@
     where RECORDID = #{recordid,jdbcType=VARCHAR}
   </update>
     <!--获取炼钢厂数据-->
-  <select id="getDataAsLg"  resultMap="BaseResultMap">
+  <select id="getDataAsLg"  parameterType="java.lang.String" resultMap="BaseResultMap">
     select 'QualityInspectionCenter' as detectiondepartment, '大宗' as analyst, t.*, t1.unit
   from (select sitem,
                monitoringvalue,
@@ -468,11 +468,11 @@
                                                              '100014'))) t
   left join t_cm_0311 t1
     on t.sitem = t1.ITEMCODE
- where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+ where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
   </select>
 
     <!--获取冶炼厂数据-->
-    <select id="getDataAsYlc" resultMap="BaseResultMap">
+    <select id="getDataAsYlc" parameterType="java.lang.String" resultMap="BaseResultMap">
         select 'QualityInspectionCenter' as detectiondepartment,
        '大宗' as analyst,
        t.*,
@@ -650,10 +650,10 @@
                                                              '100014'))) t
   left join t_cm_0311 t1
     on t.sitem = t1.ITEMCODE
- where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+ where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
     <!--获取一高线数据-->
-    <select id="getDataAsYgx" resultMap="BaseResultMap">
+    <select id="getDataAsYgx" parameterType="java.lang.String" resultMap="BaseResultMap">
         select 'QualityInspectionCenter' as detectiondepartment,
        '大宗' as analyst,
        t.*,
@@ -693,10 +693,10 @@
                                                              '100014'))) t
   left join t_cm_0311 t1
     on t.sitem = t1.ITEMCODE
- where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+ where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
     <!--获取二高线数据-->
-    <select id="getDataAsEgx" resultMap="BaseResultMap">
+    <select id="getDataAsEgx" parameterType="java.lang.String" resultMap="BaseResultMap">
         select 'QualityInspectionCenter' as detectiondepartment,
        '大宗' as analyst,
        t.*,
@@ -736,10 +736,10 @@
                                                              '100014'))) t
   left join t_cm_0311 t1
     on t.sitem = t1.ITEMCODE
- where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+ where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
     <!--发电厂-->
-    <select id="getDataAsFdc" resultMap="BaseResultMap">
+    <select id="getDataAsFdc"  parameterType="java.lang.String" resultMap="BaseResultMap">
         select 'QualityInspectionCenter' as detectiondepartment,
                '大宗' as analyst,
                t.*,
@@ -847,10 +847,10 @@
                                                                      '100014'))) t
           left join t_cm_0311 t1
             on t.sitem = t1.ITEMCODE
-         where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+         where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
     <!--获取机焦厂数据-->
-    <select id="getDataAsJjc" resultMap="BaseResultMap">
+    <select id="getDataAsJjc" parameterType="java.lang.String" resultMap="BaseResultMap">
                 select 'QualityInspectionCenter' as detectiondepartment,
                '大宗' as analyst,
                t.*,
@@ -926,9 +926,9 @@
                                                                      '100014'))) t
           left join t_cm_0311 t1
             on t.sitem = t1.ITEMCODE
-         where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+         where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
-    <select id="getDataAsWscj" resultMap="BaseResultMap">
+    <select id="getDataAsWscj" parameterType="java.lang.String" resultMap="BaseResultMap">
             select 'QualityInspectionCenter' as detectiondepartment,
                '大宗' as analyst,
                t.*,
@@ -1106,7 +1106,7 @@
                                                                      ))) t
           left join t_cm_0311 t1
             on t.sitem = t1.ITEMCODE
-         where t.monitordate = to_date('2021-05-15', 'yyyy-mm-dd')
+         where t.monitordate = to_date(#{date}, 'yyyy-mm-dd')
     </select>
     <select id="selectByparams" parameterType="com.steerinfo.ems.tcm0348.model.TCm0348" resultMap="BaseResultMap">
     select *

+ 13 - 7
src/main/java/com/steerinfo/ems/tcm0318/service/ITCm0318Service.java

@@ -1,9 +1,15 @@
 package com.steerinfo.ems.tcm0318.service;
 
+import com.steerinfo.ems.Utils.DateUtils;
+import com.steerinfo.ems.bfhyd.model.Bfhyd;
 import com.steerinfo.ems.tcm0318.model.TCm0318;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import org.apache.ibatis.annotations.Param;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -34,19 +40,19 @@ public interface ITCm0318Service extends IBaseService<TCm0318, String>{
     List<Map<String, Object>> datacomparison(Map<String, Object> parameters);
     List<TCm0318> getByCode(Map<String, Object> parameters);
     //获取炼钢数据
-    public void  getDataAsLg();
+    public void  getDataAsLg(@Param("date") String date);
     //获取冶炼厂数据
-    public void getDataAsYlc();
+    public void getDataAsYlc(@Param("date") String date);
     //获取一高线数据
-    public void getDataAsYgx();
+    public void getDataAsYgx(@Param("date") String date);
     //获取二高线数据
-    public void getDataAsEgx();
+    public void getDataAsEgx(@Param("date") String date);
     //获取发电厂数据
-    public void getDataAsFdc();
+    public void getDataAsFdc(@Param("date") String date);
     //获取机焦厂数据
-    public void getDataAsJjc();
+    public void getDataAsJjc(@Param("date") String date);
     //获取污水车间数据
-    public void getDataAsWscj();
+    public void getDataAsWscj(@Param("date") String date);
 
     TCm0318 selectByparams(TCm0318 tCm0318);
     //修改

+ 15 - 14
src/main/java/com/steerinfo/ems/tcm0318/service/impl/TCm0318ServiceImpl.java

@@ -79,8 +79,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     //获取炼钢数据
-    public void  getDataAsLg() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsLg();
+    public void  getDataAsLg(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsLg(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if(tCm03181 != null ){
@@ -92,8 +92,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     @Override
-    public void getDataAsYlc() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsYlc();
+    public void getDataAsYlc(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsYlc(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if(tCm03181 != null ){
@@ -105,8 +105,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     @Override
-    public void getDataAsYgx() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsYgx();
+    public void getDataAsYgx(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsYgx(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if (tCm03181 != null ) {
@@ -118,8 +118,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     @Override
-    public void getDataAsEgx() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsEgx();
+    public void getDataAsEgx(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsEgx(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if (tCm03181 != null) {
@@ -131,8 +131,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     @Override
-    public void getDataAsFdc() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsFdc();
+    public void getDataAsFdc(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsFdc(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if (tCm03181 != null ) {
@@ -144,8 +144,8 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
     }
 
     @Override
-    public void getDataAsJjc() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsJjc();
+    public void getDataAsJjc(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsJjc(date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if (tCm03181 != null ) {
@@ -156,9 +156,10 @@ public class TCm0318ServiceImpl extends BaseServiceImpl<TCm0318, String> impleme
         }
     }
 
+
     @Override
-    public void getDataAsWscj() {
-        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsWscj();
+    public void getDataAsWscj(String date) {
+        List<TCm0318> dataAsLg = tCm0318Mapper.getDataAsWscj (date);
         for (TCm0318 tCm0318 : dataAsLg) {
             TCm0318 tCm03181 = this.selectByparams(tCm0318);
             if(tCm03181 != null ){