20220207后端日志更新代码_代码质量测试1-编译器自测修复

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -90,7 +90,7 @@ public class SelfCarController {
     /**
      * 分页查询自有车交易信息
      *
-     * @param     参数集
+     * @param  selfCarTradesStr
      * @return 交易信息
      */
     @PostMapping("/updateTrades")

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerCarRecMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Repository
 public interface CustomerCarRecMapper extends BaseMapper<CustomerCarRec> {
-    int deleteByPrimaryKey(String carNum);
+   // int deleteByPrimaryKey(String carNum);
 
     int insert(CustomerCarRec record);
 

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRechargeMapper.java

@@ -28,5 +28,5 @@ public interface CustomerRechargeMapper extends BaseMapper<CustomerRecharge> {
 
     int updateByPrimaryKey(CustomerRecharge record);
 
-    List<CustomerRecharge> findAllCustomerRechargeForExport(CustomerRecharge customerRecharge);
+ //   List<CustomerRecharge> findAllCustomerRechargeForExport(CustomerRecharge customerRecharge);
 }

src/main/java/com/jkcredit/invoice/util/LogUtils.java

@@ -1,145 +0,0 @@
-package com.jkcredit.invoice.util;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.codec.binary.Base64;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.security.Key;
-
-/**
- * Created by Administrator on 2017/11/25.
- * base64加解密工具类
- */
-public class LogUtils {
-	private static final String PASSWORD_CRYPT_KEY = "3cm.xin.";
-    /**
-     * @param bytes
-     * @return
-     * @throws Exception 
-     */
-    public static String decode(String data) throws Exception {
-    	JSONObject object = JSONObject.parseObject(data);
-    	if(object.get("mobile") != null) {
-    		object.put("mobile", decryptDES(object.getString("mobile")));
-    	}
-    	if(object.get("name") != null) {
-    		object.put("name", decryptDES(object.getString("name")));
-    	}
-    	if(object.get("id_number") != null) {
-    		object.put("id_number", decryptDES(object.getString("id_number")));
-    	}
-    	if(object.get("idcard") != null) {
-    		object.put("idcard", decryptDES(object.getString("idcard")));
-    	}
-    	if(object.get("bank_card_number") != null) {
-    		object.put("bank_card_number", decryptDES(object.getString("bank_card_number")));
-    	}
-    	if(object.get("bank_no") != null) {
-    		object.put("bank_no", decryptDES(object.getString("bank_no")));
-    	}
-        return object.toString();
-    }
-
-    /**
-     * 二进制数据编码为BASE64字符串
-     *
-     * @param bytes
-     * @return
-     * @throws Exception
-     */
-    public static String encode(String data) {
-    	try {
-			data = URLDecoder.decode(data, "utf-8");
-			JSONObject object = JSONObject.parseObject(data);
-	    	if(object.get("mobile") != null) {
-	    		object.put("mobile", encryptDES(object.getString("mobile")));
-	    	}
-	    	if(object.get("name") != null) {
-	    		object.put("name",encryptDES(object.getString("name")));
-	    	}
-	    	if(object.get("id_number") != null) {
-	    		object.put("id_number", encryptDES(object.getString("id_number")));
-	    	}
-	    	if(object.get("idcard") != null) {
-	    		object.put("idcard", encryptDES(object.getString("idcard")));
-	    	}
-	    	if(object.get("bank_card_number") != null) {
-	    		object.put("bank_card_number", encryptDES(object.getString("bank_card_number")));
-	    	}
-	    	if(object.get("bank_no") != null) {
-	    		object.put("bank_no", encryptDES(object.getString("bank_no")));
-	    	}
-	        return object.toString();
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-    	return data;
-    }
-    
-    /**
-	 * 加密数据
-	 * @param encryptString  注意：这里的数据长度只能为8的倍数
-	 * @param encryptKey
-	 * @return
-	 * @throws Exception
-	 */
-	public static String encryptDES(String encryptString) {
-		try {
-			StringBuffer sb = new StringBuffer();
-			sb.append(encryptString);
-			for (int i = 0; i < 8 - encryptString.getBytes("UTF-8").length % 8 ; i++) {
-				sb.append("=");
-			}
-			encryptString = sb.toString();
-			SecretKeySpec key = new SecretKeySpec(getKey(PASSWORD_CRYPT_KEY), "DES");
-			Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding");
-			cipher.init(Cipher.ENCRYPT_MODE, key);
-			byte[] encryptedData = cipher.doFinal(encryptString.getBytes("UTF-8"));
-			return Base64.encodeBase64String(encryptedData);
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return encryptString;
-	}
-	
-	/***
-	 * 解密数据
-	 * @param decryptString
-	 * @param decryptKey
-	 * @return
-	 * @throws Exception
-	 */
-	public static String decryptDES(String decryptString) throws Exception {
-		SecretKeySpec key = new SecretKeySpec(getKey(PASSWORD_CRYPT_KEY), "DES");
-		Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding");
-		cipher.init(Cipher.DECRYPT_MODE, key);
-		byte decryptedData[] = cipher.doFinal(Base64.decodeBase64(decryptString));
-		return new String(decryptedData).replaceAll("=", "");
-	}
-	
-	/**
-	 * 自定义一个key
-	 * @param string 
-	 */
-	public static byte[] getKey(String keyRule) {
-		Key key = null;
-		byte[] keyByte = keyRule.getBytes();
-		// 创建一个空的八位数组,默认情况下为0
-		byte[] byteTemp = new byte[8];
-		// 将用户指定的规则转换成八位数组
-		for (int i = 0; i < byteTemp.length && i < keyByte.length; i++) {
-			byteTemp[i] = keyByte[i];
-		}
-		key = new SecretKeySpec(byteTemp, "DES");
-		return key.getEncoded();
-	}
-    public static void main(String[] args) throws Exception {
-		String a = "{\"id_number\":\"210703199104012012\",\"bank_card_number\":\"321323199812092885\",\"name\":\"刘玺\",\"mobile\":\"15991856264\",\"sign\":\"a93471e386fed0427c68bd6e9967011b\"}";
-		System.out.println(encode(a));
-		String b = "{\"sign\":\"a93471e386fed0427c68bd6e9967011b\",\"id_number\":\"NjEyMzIzMTk5MjA5MDg0ODcy\",\"name\":\"5YiY5466\",\"bank_card_number\":\"NjIxNDY4MDA0ODU0NTA1NQ==\",\"mobile\":\"MTU4NzMwNTI4MzY=\"}";
-		System.out.println(decode(encode(a))); 
-    }
-}

src/main/java/com/jkcredit/invoice/util/PlateCheckUtil.java

@@ -14,14 +14,6 @@ import java.util.regex.*;
  **/
 public class PlateCheckUtil {
 
-    /**
-     * 利用正则表达式判断字符串是否是数字
-     * @param str
-     * @return
-     * */
-    public static boolean isNumeric(String str){
-        return Pattern.matches("^[0-6]|9\\d{1}$",str);
-    }
 
     /**
      *     1、传统车牌

src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -6,142 +6,142 @@
         <id column="id" property="id"/>
         <result column="customId" property="customId"/>
         <result column="companyNum" property="companyNum"/>
-        <result column="tradeId" property="tradeId"/>
-        <result column="fee" property="fee"/>
-        <result column="calculateTime" property="calculateTime"/>
-        <result column="ctype" property="ctype"/>
-        <result column="invoiceMkTime" property="invoiceMkTime"/>
-        <result column="companyReferencenum" property="companyReferencenum"/>
-        <result column="companyName" property="companyName"/>
-        <result column="companyLongName" property="companyLongName"/>
-    </resultMap>
+        <!-- <result column="tradeId" property="tradeId"/>-->
+          <result column="fee" property="fee"/>
+        <!--  <result column="calculateTime" property="calculateTime"/>-->
+        <!--  <result column="ctype" property="ctype"/>-->
+         <result column="invoiceMkTime" property="invoiceMkTime"/>
+         <result column="companyReferencenum" property="companyReferencenum"/>
+         <result column="companyName" property="companyName"/>
+         <result column="companyLongName" property="companyLongName"/>
+     </resultMap>
 
-    <sql id="baseSql">
-        id,
-        customId,
-        companyNum,
-        etcNum,
-        fee,
-        calTime,
-        invoiceMkTime,
-        companyReferencenum,
-        companyName,
-        companyLongName
-    </sql>
-    <select id="selectAllByPage" resultMap="BaseResultMap">
-        select
-        <include refid="baseSql" />
-        from t_SelfCalculateInfor
-        where 1 = 1
-        <if test="calculateInfor.customId != null and calculateInfor.customId != ''">
-            and  customId = BINARY #{calculateInfor.customId}
-        </if>
+     <sql id="baseSql">
+         id,
+         customId,
+         companyNum,
+         etcNum,
+         fee,
+         calTime,
+         invoiceMkTime,
+         companyReferencenum,
+         companyName,
+         companyLongName
+     </sql>
+     <select id="selectAllByPage" resultMap="BaseResultMap">
+         select
+         <include refid="baseSql" />
+         from t_SelfCalculateInfor
+         where 1 = 1
+         <if test="calculateInfor.customId != null and calculateInfor.customId != ''">
+             and  customId = BINARY #{calculateInfor.customId}
+         </if>
 
-        <if test="calculateInfor.companyReferencenum != null and calculateInfor.companyReferencenum != ''">
-            and  companyReferencenum = BINARY #{calculateInfor.companyReferencenum}
-        </if>
-        <if test="calculateInfor.companyName != null and calculateInfor.companyName != ''">
-            and  companyName LIKE BINARY CONCAT('%',#{calculateInfor.companyName},'%')
-        </if>
-        <if test="calculateInfor.companyLongName != null and calculateInfor.companyLongName != ''">
-            and  companyLongName LIKE BINARY CONCAT('%',#{calculateInfor.companyLongName},'%')
-        </if>
-        <if test="calculateInfor.etcNum != null and calculateInfor.etcNum != ''">
-            and  etcNum = BINARY #{calculateInfor.etcNum}
-        </if>
-        <if test="calculateInfor.calTime != null and calculateInfor.calTime != ''">
-            and  calTime BETWEEN #{calculateInfor.calTimeStart} and #{calculateInfor.calTimeEnd}
-        </if>
-        order by id DESC
-    </select>
-    <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
-        select
-        <include refid="baseSql" />
-        from t_SelfCalculateInfor where calTime = #{calTime,jdbcType=VARCHAR} and BINARY etcNum = #{etcNum,jdbcType=VARCHAR}
-    </select>
-    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor" >
-        insert into t_SelfCalculateInfor (
-        customId,
-        companyNum,
-        etcNum,
-        fee,
-        calTime,invoiceMkTime,companyReferencenum,companyName,companyLongName
-        )
-        values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
-        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR}
-        )
-    </insert>
-    <resultMap id="staticResultMap" type="java.util.Map">
-        <result column="customId" property="customId"/>
-        <result column="companyNum" property="companyNum"/>
-        <result column="companyReferencenum" property="companyReferencenum"/>
-        <result column="etcNum" property="etcNum"/>
-        <result column="tradeIdNum" property="tradeIdNum"/>
-        <result column="feeNum" property="feeNum"/>
-    </resultMap>
-    <select id="findSelfcarCalculateInfoSta" resultMap="staticResultMap">
-        select k.*,
-        (
-        select count(1) from (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = companyNum
+         <if test="calculateInfor.companyReferencenum != null and calculateInfor.companyReferencenum != ''">
+             and  companyReferencenum = BINARY #{calculateInfor.companyReferencenum}
+         </if>
+         <if test="calculateInfor.companyName != null and calculateInfor.companyName != ''">
+             and  companyName LIKE BINARY CONCAT('%',#{calculateInfor.companyName},'%')
+         </if>
+         <if test="calculateInfor.companyLongName != null and calculateInfor.companyLongName != ''">
+             and  companyLongName LIKE BINARY CONCAT('%',#{calculateInfor.companyLongName},'%')
+         </if>
+         <if test="calculateInfor.etcNum != null and calculateInfor.etcNum != ''">
+             and  etcNum = BINARY #{calculateInfor.etcNum}
+         </if>
+         <if test="calculateInfor.calTime != null and calculateInfor.calTime != ''">
+             and  calTime BETWEEN #{calculateInfor.calTimeStart} and #{calculateInfor.calTimeEnd}
+         </if>
+         order by id DESC
+     </select>
+     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
+         select
+         <include refid="baseSql" />
+         from t_SelfCalculateInfor where calTime = #{calTime,jdbcType=VARCHAR} and BINARY etcNum = #{etcNum,jdbcType=VARCHAR}
+     </select>
+     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor" >
+         insert into t_SelfCalculateInfor (
+         customId,
+         companyNum,
+         etcNum,
+         fee,
+         calTime,invoiceMkTime,companyReferencenum,companyName,companyLongName
+         )
+         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
+         #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR}
+         )
+     </insert>
+     <resultMap id="staticResultMap" type="java.util.Map">
+         <result column="customId" property="customId"/>
+         <result column="companyNum" property="companyNum"/>
+         <result column="companyReferencenum" property="companyReferencenum"/>
+         <result column="etcNum" property="etcNum"/>
+         <result column="tradeIdNum" property="tradeIdNum"/>
+         <result column="feeNum" property="feeNum"/>
+     </resultMap>
+     <select id="findSelfcarCalculateInfoSta" resultMap="staticResultMap">
+         select k.*,
+         (
+         select count(1) from (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = companyNum
 
-            <if test="etcNum != null and etcNum != ''">
-                and  f.etcNum = BINARY #{etcNum}
-            </if>
-            <if test="calTime != null and calTime != ''">
-                and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
-            </if>
-        ) g
-        ) etcNum,
-        (select count(1) from t_SellCarTrade t where t.companyNum = k.companyNum
-        and t.cardId in (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = k.companyNum
+             <if test="etcNum != null and etcNum != ''">
+                 and  f.etcNum = BINARY #{etcNum}
+             </if>
+             <if test="calTime != null and calTime != ''">
+                 and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+             </if>
+         ) g
+         ) etcNum,
+         (select count(1) from t_SellCarTrade t where t.companyNum = k.companyNum
+         and t.cardId in (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = k.companyNum
 
-            <if test="etcNum != null and etcNum != ''">
-                and  f.etcNum = BINARY #{etcNum}
-            </if>
-            <if test="calTime != null and calTime != ''">
-                and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
-            </if>
-        )
-        <if test="calTime != null and calTime != ''">
-            and t.exTime BETWEEN #{calTimeStart} and #{calTimeEnd}
-        </if>
-        ) tradeIdNum
+             <if test="etcNum != null and etcNum != ''">
+                 and  f.etcNum = BINARY #{etcNum}
+             </if>
+             <if test="calTime != null and calTime != ''">
+                 and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+             </if>
+         )
+         <if test="calTime != null and calTime != ''">
+             and t.exTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+         </if>
+         ) tradeIdNum
 
-        from (
-        select
-        customId,
-        companyNum,
-        companyReferencenum,
-        count(1) feeNum
-        from t_SelfCalculateInfor h
-        <where>
-            <if test="customId != null and customId != ''">
-                and  customId = BINARY #{customId}
-            </if>
-            <if test="companyReferencenum != null and companyReferencenum != ''">
-                and  companyReferencenum = BINARY #{companyReferencenum}
-            </if>
-            <if test="etcNum != null and etcNum != ''">
-                and  etcNum = BINARY #{etcNum}
-            </if>
-            <if test="calTime != null and calTime != ''">
-                and  calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
-            </if>
-        </where>
-        GROUP by customId,companyNum,companyReferencenum) k
-    </select>
-    <select id="selectEtcNum" resultMap="BaseResultMap">
-        select
-        <include refid="baseSql" />
-        from t_SelfCalculateInfor
-    </select>
-    <select id="selectAllByPage" resultMap="BaseResultMap">
-        select
-        <include refid="baseSql" />
-        from t_SelfCalculateInfor
-    </select>
+         from (
+         select
+         customId,
+         companyNum,
+         companyReferencenum,
+         count(1) feeNum
+         from t_SelfCalculateInfor h
+         <where>
+             <if test="customId != null and customId != ''">
+                 and  customId = BINARY #{customId}
+             </if>
+             <if test="companyReferencenum != null and companyReferencenum != ''">
+                 and  companyReferencenum = BINARY #{companyReferencenum}
+             </if>
+             <if test="etcNum != null and etcNum != ''">
+                 and  etcNum = BINARY #{etcNum}
+             </if>
+             <if test="calTime != null and calTime != ''">
+                 and  calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+             </if>
+         </where>
+         GROUP by customId,companyNum,companyReferencenum) k
+     </select>
+    <!--    <select id="selectEtcNum" resultMap="BaseResultMap">
+           select
+           <include refid="baseSql" />
+           from t_SelfCalculateInfor
+       </select> -->
+     <!--  <select id="selectAllByPage" resultMap="BaseResultMap">
+           select
+           <include refid="baseSql" />
+           from t_SelfCalculateInfor
+       </select> -->
 
-    <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
-        UPDATE t_SelfCalculateInfor set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
-    </update>
-</mapper>
+     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
+         UPDATE t_SelfCalculateInfor set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
+     </update>
+ </mapper>