Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1

src/main/java/com/founder/interservice/mapper/xzxt/UserMapper.java

+package com.founder.interservice.mapper.xzxt;
+
+import com.founder.interservice.user.model.User;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by zhulinying on 2019/3/20.
+ * @ClassName： UserMapper
+ * @Description: java类作用描述
+ * @CreateDate： 2019-03-20 10:22
+ * @Version: 1.0
+ */
+@Repository
+public interface UserMapper {
+    /**
+     * 根据用户名和警号查询用户列表
+     * @param user
+     * @return
+     */
+    public List<User> queryUserByid(User user);
+}

src/main/java/com/founder/interservice/user/controller/UserContoller.java

 package com.founder.interservice.user.controller;
 
-import com.founder.interservice.tracktraveltogether.service.TrackTogetherService;
+import com.founder.interservice.exception.InterServiceException;
+import com.founder.interservice.user.model.User;
+import com.founder.interservice.user.service.UserService;
+import com.founder.interservice.user.vo.UserVOS;
+import com.founder.interservice.util.EasyUIPage;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName： UserContoller
@@ -17,7 +30,51 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 public class UserContoller {
 
     @Autowired
-    private TrackTogetherService trackTogetherService;
+    private UserService userService;
+    /**
+     * 根据用户名或警号查询用户列表
+     * username: 用户名
+     * policemanid：警号
+     * @return
+     */
+    @RequestMapping(value = "/queryUserByid")
+    @ResponseBody
+    public Map<String,Object> queryUserByid(String userid, String policemanid,
+                                                        @RequestParam(value = "page",defaultValue = "0") int page,
+                                                        @RequestParam(value = "rows",defaultValue = "0") int rows){
+        Map<String, Object> resultMap = new HashMap<>();
+        List<UserVOS> userVOS = null;
+        try{
+            EasyUIPage easyUIPage = new EasyUIPage();
+            easyUIPage.setPage(page);
+            easyUIPage.setPagePara(rows);
+            int begin = easyUIPage.getBegin();
+            int end = easyUIPage.getEnd();
+            User user = new User();
+            user.setUserid(userid);
+            user.setPolicemanid(policemanid);
+            user.setBegin(begin);
+            user.setEnd(end);
+            List<User> userList = userService.queryUserByid(user);
+            if(null != userList && !userList.isEmpty()){
+                userVOS = new ArrayList<>();
+                for (User us : userList) {
+                    UserVOS userVO = new UserVOS();
+                    BeanUtils.copyProperties(us,userVOS);
+                    userVOS.add(userVO);
+                }
+            }else{
+                userVOS = new ArrayList<>();
+            }
+            resultMap.put("total", userVOS.size());
+            resultMap.put("rows",userVOS);
+        }catch (InterServiceException e){
+            e.printStackTrace();
+            resultMap.put("total", 0);
+            resultMap.put("rows", new ArrayList<>());
+        }
+        return resultMap;
+    }
 
 
 }

src/main/java/com/founder/interservice/user/model/User.java

@@ -19,20 +19,27 @@ import java.util.Date;
 @DynamicUpdate
 public class User {
     @Id
-    private String taskId; //任务编号
-    private String objectValue; //对象值
-    private String imsi; //imsi
-    private String objectType; //对象类型
-    private String taskName; //任务名称
-    private String taskCaseId; //案件编号
-    private String state; //任务状态
-    private String progress;// 任务进度
-    private Date startTime; //开始时间
-    private Date endTime; //结束时间
-    private String fsrjh;//发送人警号
-    private String fsrIdentity;//发送人身份证号
-    @Column(insertable = false)
-    private Date djsj; //登记时间
+    private String userid;
+    private String tech_id;
+    private String username;
+    private String user_level;
+    private String password;
+    private String true_name;
+    private String open_flag;
+    private String default_module;
+    private String remark;
+    private Date create_date;
+    private String create_pname;
+    private Date modify_date;
+    private String modify_pname;
+    private String policemanid;
+    private String card_id;
+    private String phone_no;
+    private String jz_dwdm;
+    private String jz_dwmc;
+    private String scbz;
+    private String sex;
+    private String birthday;
     //单独给实体添加私有属性
     @Transient
     private int begin;

src/main/java/com/founder/interservice/user/service/UserService.java

 package com.founder.interservice.user.service;
 
+import com.founder.interservice.user.model.User;
+
+import java.util.List;
+
 /**
  * @ClassName： UserService
  * @Auther： 朱琳瑛
@@ -8,5 +12,5 @@ package com.founder.interservice.user.service;
  * @Version: 1.0
  */
 public interface UserService {
-
+    public List<User> queryUserByid(User user);
 }

src/main/java/com/founder/interservice/user/service/impl/UserServiceImpl.java

 package com.founder.interservice.user.service.impl;
 
+import com.founder.interservice.mapper.xzxt.UserMapper;
+import com.founder.interservice.user.model.User;
 import com.founder.interservice.user.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @ClassName： UserService
  * @Auther： 朱琳瑛
@@ -14,10 +19,19 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 @Service
 public class UserServiceImpl implements UserService {
+    @Autowired
+    private UserMapper userMapper;
 
-   /* @Value(value = "${wabigdata.trackTravelTogetherForPhoneTask.url}")
-    private String TOGETHER_TASK_URL;*/
-
+    /**
+     * 根据用户名或警号查询用户列表
+     * username: 用户名
+     * policemanid：警号
+     * @return
+     */
+    @Override
+    public List<User> queryUserByid(User user) {
+        return userMapper.queryUserByid(user);
+    }
 
 
 }

src/main/java/com/founder/interservice/user/vo/UserVOS.java

+package com.founder.interservice.user.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户实体的VO类
+ */
+@Data
+public class UserVOS {
+    private String userid;
+    private String tech_id;
+    private String username;
+    private String user_level;
+    private String password;
+    private String true_name;
+    private String open_flag;
+    private String default_module;
+    private String remark;
+    private Date create_date;
+    private String create_pname;
+    private Date modify_date;
+    private String modify_pname;
+    private String policemanid;
+    private String card_id;
+    private String phone_no;
+    private String jz_dwdm;
+    private String jz_dwmc;
+    private String scbz;
+    private String sex;
+    private String birthday;
+}

src/main/resources/mybatis/mapper/xzxt/UserMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.interservice.mapper.xzxt.UserMapper">
+
+    <select id="queryUserByid" parameterType="com.founder.interservice.user.model.User" resultType="com.founder.interservice.user.model.User">
+        select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select
+        t.USERID as userid,
+        t.TECH_ID as tech_id,
+        t.USERNAME as username,
+        t.USER_LEVEL as user_level,
+        t.PASSWORD as password,
+        t.TRUE_NAME as true_name,
+        t.OPEN_FLAG as open_flag,
+        t.DEFAULT_MODULE as default_module,
+        t.remark as remark,
+        t.CREATE_DATE as create_date,
+        t.CREATE_PNAME as create_pname,
+        t.MODIFY_DATE as modify_date,
+        t.MODIFY_PNAME as modify_pname,
+        t.POLICEMANID as policemanid,
+        t.CARD_ID as card_id,
+        t.PHONE_NO as phone_no,
+        t.JZ_DWDM as jz_dwdm,
+        t.JZ_DWMC as jz_dwmc,
+        t.SEX as sex,
+        t.BIRTHDAY as birthday,
+        t.SCBZ as scbz
+        from TB_ST_USER t
+        where
+        t.SCBZ="0"
+        <if test="userid != null and userid != ''">
+            and t.USERID = #{userid}
+        </if>
+        <if test="policemanid != null and policemanid != ''">
+            and t.POLICEMANID = #{policemanid}
+        </if>
+        order by t.create_date
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{end }
+        ) t2
+        where rn <![CDATA[ > ]]> #{begin }
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/static/sql/S034.20190320_zhulinying_新增TB_ST_USER表.txt

+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S034',0);
+INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S034',0);
+COMMIT;
+-------------------------------------------------------------------------------------------
+CREATE TABLE XZXT.TB_ST_USER
+(
+  USERID          VARCHAR2(32 BYTE)             NOT NULL,
+  TECH_ID         VARCHAR2(32 BYTE),
+  USERNAME        VARCHAR2(50 BYTE),
+  USER_LEVEL      VARCHAR2(4 BYTE),
+  PASSWORD        VARCHAR2(50 BYTE),
+  TRUE_NAME       VARCHAR2(100 BYTE),
+  OPEN_FLAG       VARCHAR2(4 BYTE),
+  DEFAULT_MODULE  VARCHAR2(4 BYTE),
+  REMARK          CLOB,
+  CREATE_DATE     DATE,
+  CREATE_PNAME    VARCHAR2(50 BYTE),
+  MODIFY_DATE     DATE,
+  MODIFY_PNAME    VARCHAR2(50 BYTE),
+  POLICEMANID     VARCHAR2(32 BYTE),
+  CARD_ID         VARCHAR2(28 BYTE),
+  PHONE_NO        VARCHAR2(20 BYTE),
+  JZ_DWDM         VARCHAR2(32 BYTE),
+  JZ_DWMC         VARCHAR2(200 BYTE),
+  SCBZ            VARCHAR2(1 BYTE),
+  SEX             VARCHAR2(4 BYTE),
+  BIRTHDAY        VARCHAR2(50 BYTE)
+)
+TABLESPACE TBS_BIGDATA
+PCTUSED    0
+PCTFREE    10
+INITRANS   1
+MAXTRANS   255
+STORAGE    (
+            PCTINCREASE      0
+            BUFFER_POOL      DEFAULT
+           )
+LOGGING
+NOCOMPRESS
+NOCACHE
+NOPARALLEL
+MONITORING;
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.USERID IS '主键id';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.TECH_ID IS '角色id';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.USERNAME IS '用户名';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.USER_LEVEL IS '用户级别';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.PASSWORD IS '密码';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.TRUE_NAME IS '真实姓名';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.CREATE_DATE IS '创建时间';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.CREATE_PNAME IS '创建用户名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.MODIFY_DATE IS '修改时间';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.MODIFY_PNAME IS '修改用户名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.POLICEMANID IS '警号';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.PHONE_NO IS '手机号';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.JZ_DWDM IS '用户单位';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.JZ_DWMC IS '用户单位名称';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.SCBZ IS '删除标志';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.SEX IS '性别';
+
+COMMENT ON COLUMN XZXT.TB_ST_USER.BIRTHDAY IS '出生日期';
+
+
+CREATE UNIQUE INDEX XZXT.TB_ST_USER_PK ON XZXT.TB_ST_USER
+(USERID)
+LOGGING
+TABLESPACE TBS_BIGDATA
+PCTFREE    10
+INITRANS   2
+MAXTRANS   255
+STORAGE    (
+            PCTINCREASE      0
+            BUFFER_POOL      DEFAULT
+           )
+NOPARALLEL;
+
+
+ALTER TABLE XZXT.TB_ST_USER ADD (
+  CONSTRAINT TB_ST_USER_PK
+ PRIMARY KEY
+ (USERID));
+
+-------------------------------------------------------------------------------------------
+UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S034';
+COMMIT;
\ No newline at end of file