1.注释本地权限验证：2、生成无状态Token

src/main/java/com/steerinfo/auth/shiro/jwt/JwtStatelessAccessControlFilter.java

@@ -1,16 +1,5 @@
 package com.steerinfo.auth.shiro.jwt;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UnknownAccountException;
-import org.apache.shiro.web.filter.AccessControlFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
-
 import com.steerinfo.framework.cache.Caches;
 import com.steerinfo.framework.constant.ShiroConstant;
 import com.steerinfo.framework.exception.ShiroJwtException;
@@ -19,7 +8,16 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.jwt.JwtUtils;
 import com.steerinfo.framework.utils.text.MD5Utils;
 import com.steerinfo.framework.utils.web.HttpUtils;
-import com.steerinfo.auth.shiro.token.StatelessToken;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UnknownAccountException;
+import org.apache.shiro.web.filter.AccessControlFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 
@@ -102,10 +100,10 @@ public class JwtStatelessAccessControlFilter extends AccessControlFilter {
             } catch (ShiroJwtException e){
                 throw new AuthenticationException(e.getMessage());
             }
-            // 2、生成无状态Token
-            StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
-            // 3、委托给Realm进行登录
-            getSubject(request, response).login(token);
+            //// 2、生成无状态Token
+            //StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
+            //// 3、委托给Realm进行登录
+            //getSubject(request, response).login(token);
         } catch (UnknownAccountException e){
             logger.debug(e.getMessage());
             return false;

src/main/java/com/steerinfo/auth/shiro/realm/OssServiceClient.java

@@ -1,14 +1,16 @@
 package com.steerinfo.auth.shiro.realm;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import com.steerinfo.framework.controller.RESTfulResult;
+import java.util.HashMap;
 
 @FeignClient(value = "sysmanage-service", fallback = OssServiceHystrix.class)
-// @FeignClient(value = "sso-service", fallback = OssServiceHystrix.class)
+// @FeignClient(value = "http://172.16.90.221:8001", fallback = OssServiceHystrix.class)
 public interface OssServiceClient {
 
 	@RequestMapping(value="/v1/sysusers/{id}", method=RequestMethod.GET)
@@ -17,19 +19,19 @@ public interface OssServiceClient {
 	@RequestMapping(value="/v1/sysusers/user/token/", method=RequestMethod.GET)
     public RESTfulResult getUserByToken();
 	
-	// /**
-	// * 获取数据权限
-	// * @return
-	// */
-	// @RequestMapping(value="/v1/sysdatablepolicys/daTablePolicyUserId",
-	// method=RequestMethod.GET)
-	// public RESTfulResult daTablePolicyUserId(@RequestParam HashMap<String,
-	// Object> parmas);
-	
-	/**
+	 /**
 	 * 获取数据权限
 	 * @return
 	 */
-	@RequestMapping(value="/v1/sysdatablepolicys/getDaTablePolicys", method=RequestMethod.GET)
-    public Object getDaTablePolicys();
+	 @RequestMapping(value="/v1/sysdatablepolicys/daTablePolicyUserId",
+	 method=RequestMethod.GET)
+	 public RESTfulResult daTablePolicyUserId(@RequestParam HashMap<String,
+		  Object> parmas);
+	
+	///**
+	// * 获取数据权限
+	// * @return
+	// */
+	//@RequestMapping(value="/v1/sysdatablepolicys/getDaTablePolicys", method=RequestMethod.GET)
+    //public Object getDaTablePolicys();
 }

src/main/java/com/steerinfo/auth/shiro/realm/OssServiceHystrix.java

@@ -5,6 +5,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import com.steerinfo.framework.controller.RESTfulResult;
 
+import java.util.HashMap;
+
 @Component
 public class OssServiceHystrix implements OssServiceClient {
 	
@@ -21,11 +23,17 @@ public class OssServiceHystrix implements OssServiceClient {
 		logger.info("熔断...Fallback of getUserByToken is executed");
 		return null;
 	}
-	
+
 	@Override
-	public Object getDaTablePolicys() {
-		logger.info("熔断...Fallback of getDaTablePolicys is executed");
+	public RESTfulResult daTablePolicyUserId(HashMap<String, Object> parmas) {
+		logger.info("熔断...Fallback of daTablePolicyUserId is executed");
 		return null;
 	}
 
+	//@Override
+	//public Object getDaTablePolicys() {
+	//	logger.info("熔断...Fallback of getDaTablePolicys is executed");
+	//	return null;
+	//}
+
 }

src/main/java/com/steerinfo/ems/Utils/StrUtils.java

@@ -11,13 +11,14 @@ import java.util.regex.Pattern;
  *
  */
 public class StrUtils {
+    private static final Pattern pattern = Pattern.compile("[0-9]*");
     /**
      * 判断字符串是否为正整数或小数
      * @param str
      * @return
      */
     public static boolean isNumeric(String str) {
-        Pattern pattern = Pattern.compile("[0-9]*");
+
         if (str.indexOf(".") > 0) {//判断是否有小数点
             if (str.indexOf(".") == str.lastIndexOf(".") && str.split("\\.").length == 2) { //判断是否只有一个小数点
                 return pattern.matcher(str.replace(".", "")).matches();

src/main/java/com/steerinfo/ems/dzmaterialsf/mapper/DzMaterialSfMapper.xml

@@ -19,14 +19,17 @@
     <result column="UPDATEMAN" jdbcType="VARCHAR" property="updateman" />
     <result column="UPDATETIME" jdbcType="VARCHAR" property="updatetime" />
     <result column="READTIME" jdbcType="VARCHAR" property="readtime" />
+    <result column="DJLX" jdbcType="VARCHAR" property="djlx" />
+    <result column="PZDL" jdbcType="VARCHAR" property="pzdl" />
   </resultMap>
   <sql id="columns">
     GBSJ, CINVCCODE, CINVCODE, CWHCODE, CINVCNAME, CINVNAME, CINVSTD, CWHNAME, MZ, PZ, 
-    JZ, TAB, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME
+    JZ, TAB, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME, DJLX, PZDL
   </sql>
   <sql id="columns_alias">
     t.GBSJ, t.CINVCCODE, t.CINVCODE, t.CWHCODE, t.CINVCNAME, t.CINVNAME, t.CINVSTD, t.CWHNAME, 
-    t.MZ, t.PZ, t.JZ, t.TAB, t.CREATEMAN, t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.READTIME
+    t.MZ, t.PZ, t.JZ, t.TAB, t.CREATEMAN, t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.READTIME,
+    t.DJLX, t.PZDL
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DZ_MATERIAL_SF
@@ -87,6 +90,12 @@
       <if test="readtime != null and readtime != ''">
         and READTIME = #{readtime}
       </if>
+      <if test="djlx != null and djlx != ''">
+        and DJLX = #{djlx}
+      </if>
+      <if test="pzdl != null and pzdl != ''">
+        and PZDL = #{pzdl}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -142,6 +151,12 @@
       <if test="readtime != null and readtime != ''">
         and READTIME LIKE '%${readtime}%'
       </if>
+      <if test="djlx != null and djlx != ''">
+        and READTIME LIKE '%${djlx}%'
+      </if>
+      <if test="pzdl != null and pzdl != ''">
+        and PZDL LIKE '%${pzdl}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="map">
@@ -150,6 +165,8 @@
       and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
       and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
       and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+      and TAB = #{tab,jdbcType=VARCHAR}
+      and DJLX = #{djlx,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from DZ_MATERIAL_SF
@@ -202,6 +219,12 @@
       <if test="readtime != null and readtime != ''">
         or READTIME = #{readtime}
       </if>
+    <if test="djlx != null and djlx != ''">
+      or DJLX = #{djlx}
+    </if>
+    <if test="pzdl != null and pzdl != ''">
+      or PZDL = #{pzdl}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF (GBSJ, CINVCCODE, CINVCODE, 
@@ -209,13 +232,13 @@
       CINVSTD, CWHNAME, MZ, 
       PZ, JZ, TAB, CREATEMAN, 
       CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME)
+      READTIME,DJLX,PZDL)
     values (#{gbsj,jdbcType=VARCHAR}, #{cinvccode,jdbcType=VARCHAR}, #{cinvcode,jdbcType=VARCHAR}, 
       #{cwhcode,jdbcType=VARCHAR}, #{cinvcname,jdbcType=VARCHAR}, #{cinvname,jdbcType=VARCHAR}, 
       #{cinvstd,jdbcType=VARCHAR}, #{cwhname,jdbcType=VARCHAR}, #{mz,jdbcType=DECIMAL}, 
       #{pz,jdbcType=DECIMAL}, #{jz,jdbcType=DECIMAL}, #{tab,jdbcType=VARCHAR}, #{createman,jdbcType=VARCHAR}, 
       #{createtime,jdbcType=VARCHAR}, #{updateman,jdbcType=VARCHAR}, #{updatetime,jdbcType=VARCHAR}, 
-      #{readtime,jdbcType=VARCHAR})
+      #{readtime,jdbcType=VARCHAR},#{djlx,jdbcType=VARCHAR},#{pzdl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF
@@ -271,6 +294,12 @@
       <if test="readtime != null">
         READTIME,
       </if>
+      <if test="djlx != null">
+        DJLX,
+      </if>
+      <if test="pzdl != null">
+        PZDL,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="gbsj != null">
@@ -324,6 +353,12 @@
       <if test="readtime != null">
         #{readtime,jdbcType=VARCHAR},
       </if>
+      <if test="djlx != null">
+        #{djlx,jdbcType=VARCHAR},
+      </if>
+      <if test="pzdl != null">
+        #{pzdl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
@@ -340,11 +375,14 @@
       CREATETIME = #{createtime,jdbcType=VARCHAR},
       UPDATEMAN = #{updateman,jdbcType=VARCHAR},
       UPDATETIME = #{updatetime,jdbcType=VARCHAR},
-      READTIME = #{readtime,jdbcType=VARCHAR}
+      READTIME = #{readtime,jdbcType=VARCHAR},
+      DJLX = #{djlx,jdbcType=VARCHAR}
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
       and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
       and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
       and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+      and TAB = #{tab,jdbcType=VARCHAR}
+      and djlx = #{djlx,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     update DZ_MATERIAL_SF
@@ -388,11 +426,19 @@
       <if test="readtime != null">
         READTIME = #{readtime,jdbcType=VARCHAR},
       </if>
+      <if test="djlx != null">
+        DJLX = #{djlx,jdbcType=VARCHAR},
+      </if>
+      <if test="pzdl != null">
+        PZDL = #{pzdl,jdbcType=VARCHAR},
+      </if>
     </set>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
       and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
       and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
       and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+      and TAB = #{tab,jdbcType=VARCHAR}
+      and DJLX = #{djlx,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
     <include refid="select"/>
@@ -401,6 +447,7 @@
       and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
       and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
       and TAB = #{tab,jdbcType=VARCHAR}
+      and DJLX = #{djlx,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
@@ -418,7 +465,7 @@
       CWHNAME, MZ, PZ, 
       JZ, TAB, CREATEMAN, 
       CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME)
+      READTIME,DJLX,PZDL)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.gbsj,jdbcType=VARCHAR}, 
@@ -427,7 +474,7 @@
       #{item.cwhname,jdbcType=VARCHAR}, #{item.mz,jdbcType=DECIMAL}, #{item.pz,jdbcType=DECIMAL}, 
       #{item.jz,jdbcType=DECIMAL}, #{item.tab,jdbcType=VARCHAR}, #{item.createman,jdbcType=VARCHAR}, 
       #{item.createtime,jdbcType=VARCHAR}, #{item.updateman,jdbcType=VARCHAR}, #{item.updatetime,jdbcType=VARCHAR}, 
-      #{item.readtime,jdbcType=VARCHAR} from dual  
+      #{item.readtime,jdbcType=VARCHAR},#{item.djlx,jdbcType=VARCHAR},#{item.pzdl,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -501,16 +548,22 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
           when #{item.gbsj,jdbcType=VARCHAR} then #{item.readtime,jdbcType=VARCHAR}
        </foreach>
-    where (GBSJ,CINVCCODE,CINVCODE,CWHCODE) in
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.djlx,jdbcType=VARCHAR}
+    </foreach>
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.pzdl,jdbcType=VARCHAR}
+    </foreach>
+    where (GBSJ,CINVCCODE,CINVCODE,CWHCODE,TAB,DJLX) in
     <foreach collection="list" item="item" open="(" close=")" separator=",">
-     (#{item.gbsj, jdbcType=VARCHAR},#{item.cinvccode, jdbcType=VARCHAR},#{item.cinvcode, jdbcType=VARCHAR},#{item.cwhcode, jdbcType=VARCHAR})
+     (#{item.gbsj, jdbcType=VARCHAR},#{item.cinvccode, jdbcType=VARCHAR},#{item.cinvcode, jdbcType=VARCHAR},#{item.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR})
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from DZ_MATERIAL_SF
-    where (GBSJ,CINVCCODE,CINVCODE,CWHCODE) in
+    where (GBSJ,CINVCCODE,CINVCODE,CWHCODE,TAB,DJLX) in
     <foreach collection="list" item="item" open="(" close=")" separator=",">
-     ( #{item.gbsj, jdbcType=VARCHAR}, #{item.cinvccode, jdbcType=VARCHAR}, #{item.cinvcode, jdbcType=VARCHAR}, #{item.cwhcode, jdbcType=VARCHAR})
+     ( #{item.gbsj, jdbcType=VARCHAR}, #{item.cinvccode, jdbcType=VARCHAR}, #{item.cinvcode, jdbcType=VARCHAR}, #{item.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR})
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
@@ -518,15 +571,15 @@
   <select id="getDzMaterialSf" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select * from (
     SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
-    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, 'sh' as tab
-    FROM v_nyjk_sh where gbsj >= #{gbsj,jdbcType=VARCHAR} and
-    cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23)
+    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx, pzdl, 'sh' as tab
+    FROM v_nyjk_sh where gbsj >= #{gbsj,jdbcType=VARCHAR} and pzdl IS NOT NULL
+    --cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
+    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23),djlx, pzdl
     ) as sh union all (
     SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
-    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, 'fh' as tab
-    FROM v_nyjk_fh where gbsj >= #{gbsj,jdbcType=VARCHAR} and
-    cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23))
+    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx, pzdl, 'fh' as tab
+    FROM v_nyjk_fh where gbsj >= #{gbsj,jdbcType=VARCHAR} and pzdl IS NOT NULL
+    --cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
+    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23),djlx, pzdl)
   </select>
 </mapper>

src/main/java/com/steerinfo/ems/dzmaterialsf/model/DzMaterialSf.java

@@ -111,6 +111,18 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="读取时间",required=false)
     private String readtime;
 
+    /**
+     * 单据类型(READTIME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="单据类型",required=false)
+    private String djlx;
+
+    /**
+     * 品种(READTIME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="品种",required=false)
+    private String pzdl;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -121,6 +133,7 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
         params.put("cinvcode",this.cinvcode);
         params.put("cwhcode",this.cwhcode);
         params.put("tab",this.tab);
+        params.put("djlx",this.djlx);
         return params;
     }
 
@@ -269,6 +282,20 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
         this.readtime = readtime == null ? null : readtime.trim();
     }
 
+    public String getDjlx() { return djlx; }
+
+    public void setDjlx(String djlx) {
+        this.djlx = djlx;
+    }
+
+    public String getPzdl() {
+        return pzdl;
+    }
+
+    public void setPzdl(String pzdl) {
+        this.pzdl = pzdl;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -292,6 +319,8 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
         sb.append(", updateman=").append(updateman);
         sb.append(", updatetime=").append(updatetime);
         sb.append(", readtime=").append(readtime);
+        sb.append(", djlx=").append(djlx);
+        sb.append(", pzdl=").append(pzdl);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/ems/dzmaterialsf/service/impl/DzMaterialSfServiceImpl.java

@@ -61,6 +61,7 @@ public class DzMaterialSfServiceImpl extends CBaseServiceImpl<DzMaterialSf, Stri
                 hashMap.put("cinvcode",dzMaterialSf.getCinvcode());
                 hashMap.put("cwhcode",dzMaterialSf.getCwhcode());
                 hashMap.put("tab",dzMaterialSf.getTab());
+                hashMap.put("djlx",dzMaterialSf.getDjlx());
                 //model = dzMaterialSfMapper.selectByParameters(hashMap);
                 model = dzMaterialSfMapper.selectByPrimaryKey(dzMaterialSf);
                 if(model != null){

src/main/java/com/steerinfo/ems/emsscqklg/service/EmsLgReportService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.ems.emsscqklg.service;
 
 import com.steerinfo.ems.emsscqklg.model.EmsScqkLg;
+import com.steerinfo.ems.emsscqklg.model.LgReal;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,4 +26,7 @@ import java.util.List;
 public interface EmsLgReportService {
     @GetMapping("v1/lgreport/queryReportByTime")
     public List<EmsScqkLg> queryReportByTime();
+
+    @GetMapping("v1/lgReal/queryReals")
+    public List<LgReal> queryReals();
 }

src/main/java/com/steerinfo/ems/emsscqklg/service/impl/EmsScqkLgServiceImpl.java

@@ -39,7 +39,6 @@ public class EmsScqkLgServiceImpl extends BaseServiceImpl<EmsScqkLg, Date> imple
         return emsScqkLgMapper;
     }
 
-
     @Override
     public int dateGenerate() {
        List<EmsScqkLg> emsScqkLgs =  emsLgReportService.queryReportByTime();

src/main/java/com/steerinfo/ems/rttable/service/impl/RttableServiceImpl.java

@@ -67,8 +67,8 @@ public class RttableServiceImpl extends BaseServiceImpl<Rttable, BigDecimal> imp
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            logger.info("本次总共新增动力数据条数：" + addSize);
-            logger.info("本次总共更新动力数据条数：" + updateSize);
+            logger.info("本次总共新增五分钟动力数据条数：" + addSize);
+            logger.info("本次总共更新五分钟动力数据条数：" + updateSize);
         }
         return addSize+updateSize;
     }

src/main/java/com/steerinfo/ems/trmcalpoint/controller/TRmCalpointController.java

@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -180,6 +180,7 @@ public class TRmCalpointController extends BaseRESTfulController {
         if(model.getRecTime() == null || "".equals(model.getRecTime())){
             model.setRecTime(DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss"));
         }
+        model.setRecman(JwtUtil.getUseridByToken());
         TRmCalpoint tRmCalpoint = tRmCalpointService.add(model);
         Formula formula = new Formula();
         formula.setCode(model.getItemid());
@@ -247,6 +248,8 @@ public class TRmCalpointController extends BaseRESTfulController {
         	}
         }
         model.setItemid(id);
+        model.setUpdateman(JwtUtil.getUseridByToken());
+        model.setUpdatetime(new Date());
         List<Formula> formulaList = formulaService.getAssociatedFormula(id);
         if("0".equals(model.getUseflag()) && formulaList != null && formulaList.size() > 0){
             String ids = "";
@@ -288,6 +291,8 @@ public class TRmCalpointController extends BaseRESTfulController {
         	tl.setWorkshop(model.getNetworkid()); // 站所
         	tl.setMods(model.getTagModulus().intValue());
         	tl.setWorkprocid(model.getCostid());
+            tl.setUpdateman(JwtUtil.getUseridByToken());
+            tl.setUpdatetime(new Date());
         	tRmElectricityLocationMapper.updateByPrimaryKeySelective(tl);
         }
         LOGGER.info("计量点维护表修改前数据是" + old.toString());

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -5,6 +5,7 @@ import com.steerinfo.ems.bfhyd.service.IBfhydService;
 import com.steerinfo.ems.dzmaterialsf.service.IDzMaterialSfService;
 import com.steerinfo.ems.emsetiming.service.IEmsETimingService;
 import com.steerinfo.ems.emsscqklg.service.IEmsScqkLgService;
+import com.steerinfo.ems.emsscqklg.service.ILgRealService;
 import com.steerinfo.ems.emswaterrealtime.service.IEmsWaterRealtimeService;
 import com.steerinfo.ems.ifemsmesactitem.service.IIfEmsMesActitemService;
 import com.steerinfo.ems.ifmesemsproductorder.service.IIfMesEmsProductorderService;
@@ -116,6 +117,8 @@ public class SpringCronTask implements SchedulingConfigurer{
 	IRttableService rttableService;
 	@Autowired
 	IEmsScqkLgService emsScqkLgService;
+	@Autowired
+	ILgRealService lgRealService;
 	/**
 	 * SchedulingConfigurer接口的方法实现，加载后自动运行
 	 */
@@ -301,7 +304,16 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 dzMaterialSfService.dataGeneration();
 					 emsScqkLgService.dateGenerate();
 					 logger.info("定时任务"+taskId+"执行时长：" + (new Date().getTime() - start)/1000 + "秒");
-				 }
+				 } //else if (taskId.equalsIgnoreCase("124")) {
+					// // 每一分钟获取一次炼钢实时数据传入mosaic
+					// long start = System.currentTimeMillis();
+					// try {
+					//	 lgRealService.QueryLgReals();
+					// } catch (AxisFault e) {
+					//	 e.printStackTrace();
+					// }
+					// logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
+				 //}
 //				 else if (taskId.equalsIgnoreCase("106")) {
 //					// 获取MES水质监测数据
 //					long start = new Date().getTime();