Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/UserApi.java

@@ -47,18 +47,18 @@ public class UserApi {
         } catch (UnknownAccountException e) {
             resultMap.put("status", 201);
             resultMap.put("message", "账号不存在！");
-            logger.error("不存在的用户名：" + username);
-            logger.error("", e);
+//            logger.error("不存在的用户名：" + username);
+//            logger.error("", e);
         } catch (IncorrectCredentialsException e1) {
             resultMap.put("status", 202);
             resultMap.put("message", "密码错误！");
-            logger.error("用户密码错误，用户名：" + username + "错误密码：" + password);
-            logger.error("", e1);
+//            logger.error("用户密码错误，用户名：" + username + "错误密码：" + password);
+//            logger.error("", e1);
         } catch (Exception e) {
             resultMap.put("status", 500);
             resultMap.put("message", "用户名密码错误");
-            logger.error("用户名错误：" + username + "错误密码：" + password);
-            logger.error("Exception 用户登录异常", e);
+//            logger.error("用户名错误：" + username + "错误密码：" + password);
+//            logger.error("Exception 用户登录异常", e);
         }
         return resultMap;
     }

src/main/java/com/yxproject/start/entity/SysPermission.java

@@ -31,6 +31,8 @@ public class SysPermission implements Serializable {
     private String permission;
 
     private byte available = 0;
+
+    int zindex;
     @ManyToMany
     @JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")})
     private List<SysRole> roles;
@@ -82,4 +84,12 @@ public class SysPermission implements Serializable {
     public void setRoles(List<SysRole> roles) {
         this.roles = roles;
     }
+
+    public int getZindex() {
+        return zindex;
+    }
+
+    public void setZindex(int zindex) {
+        this.zindex = zindex;
+    }
 }
\ No newline at end of file

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -179,9 +179,12 @@ public interface ReceiptMapper {
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
 
-    @Select("select POLICE_dic.POLICE_NAME from PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK \n" +
-            "left join POLICE_dic on substr(POLICE_dic.POLICE_CODE,0,8) = substr(PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO,0,8)\n" +
-            "where group_no = #{policeCode} ")
+    @Select("SELECT POLICE_CODE,POLICE_NAME,COUNT(*) \n" +
+            "FROM PRODYD_DBA.PROD_CARd_T@PRODYD_LINK \n" +
+            "LEFT JOIN POLICE_DIC\n" +
+            "ON SUBSTR(PROD_CARD_T.UPLOAD_NO,0,6)=POLICE_DIC.POLICE_CODE\n" +
+            "where ACCEPT_NO like  #{policeCode} \n" +
+            "GROUP BY POLICE_CODE,POLICE_NAME" )
     public List<Map<String,Object>> queryPoliceName(@Param("policeCode") String policeCode);
 
     @Select("select \n" +

src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java

@@ -232,12 +232,14 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public List<Map<String, Object>> queryPoliceName(String qrCode) {
-        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(qrCode.substring(0,8));
+        if (qrCode!=null){
+            qrCode=qrCode+"%";
+        }
+        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(qrCode);
         List<Map<String,Object>> maps = new ArrayList<>();
         if (mapList.size()>0){
             maps.add(mapList.get(0));
         }
-
         return maps;
     }
 

src/main/resources/log4j.properties

-### 设置###
+### ����###
 log4j.rootLogger = debug,stdout,D,E
 
 log4j.appenderRefs = ${appenders}
 log4j.appenderRef.console.ref = STDOUT
 log4j.appenderRef.rollingFileAppender.ref = rollingFile
 
-### 输出信息到控制台 ###
+### �����Ϣ������̨ ###
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
 
-### 输出DEBUG 级别以上的日志到=E://logs/error.log ###
+### ���DEBUG �������ϵ���־��=E://logs/error.log ###
 log4j.appender.D = com.yxproject.start.utils.MyDailyRollingFileAppender
-log4j.appender.D.File = ./logs/debug.log
+log4j.appender.D.File = ./logs/YdDebug.log
 log4j.appender.D.Append = true
 log4j.appender.D.Threshold = DEBUG
 log4j.appender.D.MaxFileSize=20MB
@@ -21,17 +21,18 @@ log4j.appender.D.DatePattern = '_'yyyy-MM-dd'.log'
 log4j.appender.D.layout = org.apache.log4j.PatternLayout
 log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [%X{ip}]  [ %t:%r ] - [ %p ] %l %m%n
 
-### 输出ERROR 级别以上的日志到=E://logs/error.log ###
+### ���ERROR �������ϵ���־��=E://logs/error.log ###
 log4j.appender.E = com.yxproject.start.utils.MyDailyRollingFileAppender
-log4j.appender.E.File =./logs/error.log
+log4j.appender.E.File =./logs/YdError.log
 log4j.appender.E.Append = true
 log4j.appender.E.Threshold = ERROR
 log4j.appender.E.MaxFileSize=20MB
+log4j.appender.E.DatePattern = '_'yyyy-MM-dd'.log'
 log4j.appender.E.layout = org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [%X{ip}]  [ %t:%r ] - [ %p ] %l %m%n
 
 
-###打印SQL###
+###��ӡSQL###
 log4j.logger.org.mybatis = DEBUG
 log4j.logger.java.sql = DEBUG
 log4j.logger.java.sql.Statement = DEBUG

src/main/resources/static/js/service.js

@@ -1234,7 +1234,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             getPoliceName:function(policeCode,success) {
-                console.log(policeCode+"========================")
                 $http({
                     method: 'GET',
                     url: "../ReceiptApi/queryPoliceName"+urlTimeStamp(),

src/main/resources/static/js/utils.js

@@ -12,7 +12,7 @@ var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
     var body = {
         color: ['#003366', '#006699', '#4cabce', '#e5323e'],
         title : {
-            text: ' 北京市公安局 '+data.date+' 年本地证制证生产情况',
+            text: ' 北京市公安局 '+data.date+' 年异地证制证生产情况',
             subtext: '人次数量'
         },
         //提示框组件
@@ -24,7 +24,7 @@ var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
             type: 'scroll',
             orient: 'horizontal',
             x: 'right',
-            data: ['普通证','港澳','台湾','废证']
+            data: ['异地证','港澳','台湾','废证']
         },
         //拖拽时，是否实时更新。
         calculable: true,
@@ -51,7 +51,7 @@ var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
         //数值
         series: [
             {
-                name: '普通证',
+                name: '异地证',
                 type: 'bar',
                 barGap: 0,
                 label: labelprov,

src/main/resources/static/views/blank/blank.html

 <section class="content row">
     <div class="col-md-12" style="margin-top:20px;">
      <div class="box ">
-                    <div class="box-header">
-                        <strong>制证统计</strong>
-                        <div class="pull-right col-md-2" >
-                            <input class="form-control col-md-1"
-                                   style="width: 70px;height: 20px;"
-                                   ng-model="year"
-                                   ng-change="changeYear()">
-                            <span class="col-md-1">年</span>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-
-                    <div style="text-align: center;">
-                        <!--通过率统计图-->
-                        <div class="row" >
-                            <div class="col-md-12">
-                                <div class="yx-div-header"></div>
-                                <div id="diagram_item_ratio_certification" style="height:500px;"></div>
-                            </div>
-                        </div>
-                    </div>
+        <div class="box-header">
+            <strong>制证量柱状图</strong>
+            <div class="pull-right col-md-2" >
+                <input class="form-control col-md-1"
+                       style="width: 70px;height: 20px;"
+                       ng-model="year"
+                       ng-change="changeYear()">
+                <span class="col-md-1">年</span>
+            </div>
+        </div>
+        <div class="box box-primary" style="min-height: 600px;padding-top: 57px;padding-left: 25px;" >
+            <div style="text-align: center;">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="yx-div-header"></div>
+                        <div id="diagram_item_ratio_certification" style="height:500px;"></div>
                     </div>
                 </div>
+            </div>
+        </div>
+     </div>
     </div>
 </section>
\ No newline at end of file