Merge branch 'dev' of http://47.92.108.28/changchao/map-parent into dev

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/AsjQuery.java

+package com.founder.commonutils.viewEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2021-03-03 20:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AsjQuery对象", description="案事件基本传输信息")
+public class AsjQuery {
+
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "刑事警情类别代码")
+    private String xsjqlbdm;
+
+    @ApiModelProperty(value = "案发开始时间:2019-01-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date begin;//注意，这里使用的是String类型，前端传过来的数据无需进行类型转换
+
+    @ApiModelProperty(value = "案发结束时间:2019-12-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date end;
+
+
+}

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/CbxszAndXlaj.java

+package com.founder.commonutils.viewEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by yangyang on 2020/05/31
+ * 封装请求的参数
+ */
+@ApiModel
+public class CbxszAndXlaj {
+	@ApiModelProperty("案事件编号")
+	private String asjbh;
+	@ApiModelProperty("串并类型代码")
+	private String cblx;
+	@ApiModelProperty("串并类型描述")
+	private String cblx_str;
+	@ApiModelProperty("案件名称")
+	private String ajmc;
+	@ApiModelProperty("简要案情")
+	private String jyaq;
+	@ApiModelProperty("案发时间")
+	private String asjfssj_asjfskssj;
+	@ApiModelProperty("侦查终结")
+	private String zcjdmc;
+	@ApiModelProperty("主案")
+	private String ajzlbmc;
+	@ApiModelProperty("类案")
+	private String ajxzlbmc;
+	@ApiModelProperty("次类案")
+	private String xalbdmbcmsmc;
+	@ApiModelProperty("经度")
+	private String x;
+	@ApiModelProperty("纬度")
+	private String y;
+
+	public String getAsjbh() {
+		return asjbh;
+	}
+
+	public void setAsjbh(String asjbh) {
+		this.asjbh = asjbh;
+	}
+
+	public String getCblx() {
+		return cblx;
+	}
+
+	public void setCblx(String cblx) {
+		this.cblx = cblx;
+	}
+
+	public String getCblx_str() {
+		return cblx_str;
+	}
+
+	public void setCblx_str(String cblx_str) {
+		this.cblx_str = cblx_str;
+	}
+
+	public String getAjmc() {
+		return ajmc;
+	}
+
+	public void setAjmc(String ajmc) {
+		this.ajmc = ajmc;
+	}
+
+	public String getJyaq() {
+		return jyaq;
+	}
+
+	public void setJyaq(String jyaq) {
+		this.jyaq = jyaq;
+	}
+
+	public String getAsjfssj_asjfskssj() {
+		return asjfssj_asjfskssj;
+	}
+
+	public void setAsjfssj_asjfskssj(String asjfssj_asjfskssj) {
+		this.asjfssj_asjfskssj = asjfssj_asjfskssj;
+	}
+
+	public String getZcjdmc() {
+		return zcjdmc;
+	}
+
+	public void setZcjdmc(String zcjdmc) {
+		this.zcjdmc = zcjdmc;
+	}
+
+	public String getAjzlbmc() {
+		return ajzlbmc;
+	}
+
+	public void setAjzlbmc(String ajzlbmc) {
+		this.ajzlbmc = ajzlbmc;
+	}
+
+	public String getAjxzlbmc() {
+		return ajxzlbmc;
+	}
+
+	public void setAjxzlbmc(String ajxzlbmc) {
+		this.ajxzlbmc = ajxzlbmc;
+	}
+
+	public String getXalbdmbcmsmc() {
+		return xalbdmbcmsmc;
+	}
+
+	public void setXalbdmbcmsmc(String xalbdmbcmsmc) {
+		this.xalbdmbcmsmc = xalbdmbcmsmc;
+	}
+
+	public String getX() {
+		return x;
+	}
+
+	public void setX(String x) {
+		this.x = x;
+	}
+
+	public String getY() {
+		return y;
+	}
+
+	public void setY(String y) {
+		this.y = y;
+	}
+
+	@Override
+	public String toString() {
+		return "CbxszAndXlaj{" +
+				"asjbh='" + asjbh + '\'' +
+				", cblx='" + cblx + '\'' +
+				", cblx_str='" + cblx_str + '\'' +
+				", ajmc='" + ajmc + '\'' +
+				", jyaq='" + jyaq + '\'' +
+				", asjfssj_asjfskssj='" + asjfssj_asjfskssj + '\'' +
+				", zcjdmc='" + zcjdmc + '\'' +
+				", ajzlbmc='" + ajzlbmc + '\'' +
+				", ajxzlbmc='" + ajxzlbmc + '\'' +
+				", xalbdmbcmsmc='" + xalbdmbcmsmc + '\'' +
+				", x='" + x + '\'' +
+				", y='" + y + '\'' +
+				'}';
+	}
+}

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/TbXwAsjbz.java

+package com.founder.commonutils.viewEntity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 标注实体
+ * </p>
+ *
+ * @author yangyang java
+ * @since 2021-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TB_ST_ASJBZ")
+@ApiModel(value="TbXwAsjbz对象", description="标注")
+public class TbXwAsjbz implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案事件编号")
+    @TableId(value = "ASJBH")
+    private String asjbh;
+
+    @ApiModelProperty(value = "主类别代码")
+    @TableField("AJZLB")
+    private String ajzlb;
+
+    @ApiModelProperty(value = "类案类别代码")
+    @TableField("AJXZLB")
+    private String ajxzlb;
+
+    @ApiModelProperty(value = "次案类别代码")
+    @TableField("XALBDMBCMS")
+    private String xalbdmbcms;
+
+    @ApiModelProperty(value = "主类别名称")
+    @TableField(exist = false)
+    private String xszalxdmStr;
+
+    @ApiModelProperty(value = "类案类别名称")
+    @TableField(exist = false)
+    private String xslalxdmStr;
+
+    @ApiModelProperty(value = "次案类别名称")
+    @TableField(exist = false)
+    private String xalbdmbcmsStr;
+}

service/asj/src/main/java/com/founder/asj/controller/LoginController.java

+package com.founder.asj.controller;
+
+import com.founder.asj.service.SysUsersService;
+import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.publicEntity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/")
+@Api(tags = "登陆管理")
+public class LoginController {
+    @Autowired
+    private SysUsersService userService;
+
+    @ApiOperation(value = "登陆")
+    @PostMapping("/login")
+    @ResponseBody
+    public MapRestResult login(
+                   @RequestParam String username,
+                   @RequestParam String password){
+        SysUser user = new SysUser();
+        user.setUsername(username);
+        user.setPassword(password);
+        if (user!=null) {
+            SysUser loginUser = userService.login(user);
+            if (loginUser == null) {
+                return MapRestResult.build(201,"用户名或密码错误","1");
+            } else {
+                return MapRestResult.build(200,"登陆成功","1",loginUser);
+            }
+        }
+        return MapRestResult.error();
+    }
+}

service/asj/src/main/java/com/founder/asj/mapper/SysUsersMapper.java

@@ -4,6 +4,7 @@ package com.founder.asj.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.founder.commonutils.publicEntity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2021-03-11
  */
 @Mapper
+@Component
 public interface SysUsersMapper extends BaseMapper<SysUser> {
 
 }

service/asj/src/main/java/com/founder/asj/service/SysUsersService.java

@@ -4,6 +4,9 @@ package com.founder.asj.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.founder.commonutils.publicEntity.SysUser;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface SysUsersService extends IService<SysUser> {
+    SysUser login(SysUser user);
 
 }

service/asj/src/main/java/com/founder/asj/service/impl/SysUsersServiceImpl.java

 package com.founder.asj.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.founder.asj.mapper.SysUsersMapper;
 import com.founder.asj.service.SysUsersService;
 import com.founder.commonutils.publicEntity.SysUser;
+import io.swagger.annotations.ApiModel;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Base64;
+
 
 @Service
 public class SysUsersServiceImpl extends ServiceImpl<SysUsersMapper, SysUser> implements SysUsersService {
 
+    @Autowired
+    private SysUsersMapper sysUsersMapper;
+
+    @Override
+    public SysUser login(SysUser user) {
+        //对password进行加密
+        String password = Base64.getEncoder().encodeToString(user.getPassword().getBytes());
+        QueryWrapper<SysUser> wrapper = new QueryWrapper<SysUser>();
+        // 数据库字段名   对应值
+        wrapper.eq("USERNAME", user.getUsername());
+        wrapper.eq("PASSWORD", password);
+        wrapper.eq("OPEN_FLAG", "1");
+        wrapper.eq("SCBZ", "0");
+        //设置需要查询的字段
+        wrapper.select("IDENTITYCARD","USERNAME", "UNITCODE", "TRUE_NAME", "TELEPHONE",
+                "UNITNAME", "GRADE", "POLICEMANID");
+        user = sysUsersMapper.selectOne(wrapper);
+        return user;
+    }
 }

serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/RegInfoMapper.xml

@@ -208,7 +208,7 @@
         <if test="fsrIdentity != null and fsrIdentity != ''">and fsr_Identity = #{ fsrIdentity , jdbcType=VARCHAR }</if>
         <if test="carNum != null and carNum != ''">and carNum = #{ carNum , jdbcType=VARCHAR }</if>
         <if test="taskType != null and taskType != ''">and task_Type = #{ taskType , jdbcType=VARCHAR }</if>
-        <if test="taskName != null and taskName != ''">and task_Name = #{ task_Name , jdbcType=VARCHAR }</if>
+        <if test="taskName != null and taskName != ''">and task_Name = #{ taskName , jdbcType=VARCHAR }</if>
     </select>
     <!--获取任务结果-->
     <select id="selecteRegionalsTasksResults" parameterType="String" resultType="com.founder.commonutils.carEntity.RegionalsCarCarResult">

serviceapi/peopleapi/src/main/java/com/founder/peopleapi/service/impl/PhoneServiceImpl.java

@@ -107,7 +107,7 @@ public class PhoneServiceImpl implements PhoneService {
                     String sjhm = (String) object.get("sjhm");
                     DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                     LocalDateTime lacDt = LocalDateTime.parse(fxsj, dtf);
-                    long l = LocalDateTime.from(lacDt).atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+                    long l = LocalDateTime.from(lacDt).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
 
                     sjGjInfo.setObjectValue(sjhm);
                     sjGjInfo.setAddress(jzmc);