|
@@ -44,6 +44,7 @@ import org.springframework.web.context.request.RequestContextHolder;
|
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.validation.constraints.NotBlank;
|
|
|
import javax.validation.constraints.Size;
|
|
|
import java.sql.Date;
|
|
|
import java.sql.Timestamp;
|
|
@@ -100,7 +101,6 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
*/
|
|
|
@Override
|
|
|
public List<Czrk> listByRlry(Czrk czrk) {
|
|
|
- long startTime = System.currentTimeMillis();
|
|
|
log.info("{}于{}查询常住人员列表,查询条件:{}"
|
|
|
, AuthUtils.getLoginUser().getSysUser().getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
|
setAgeScope(czrk);
|
|
@@ -150,7 +150,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
long startTimeSql = System.currentTimeMillis();
|
|
|
czrks = czrkMapper.selectCzrkList(czrk);
|
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
|
- log.info("执行常驻查询sql语句时间:" + endTimeSql+"ms");
|
|
|
+ log.info("执行常驻查询sql语句时间:" + endTimeSql + "ms");
|
|
|
if (czrks != null && czrks.size() > 0) {
|
|
|
for (Czrk crk : czrks) {
|
|
|
String provinceCz = nullToEmpty(crk.getProvince()), cityCz = nullToEmpty(crk.getCity()), regionCz = nullToEmpty(crk.getRegion()), villageTownsCz = nullToEmpty(crk.getVillageTowns()), villageCz = nullToEmpty(crk.getVillage()), nowInCz = nullToEmpty(crk.getNowIn());
|
|
@@ -175,7 +175,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
long startTimeSql = System.currentTimeMillis();
|
|
|
List<Czrk> czrks = czrkMapper.listByRlryJzdz(czrk);
|
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
|
- log.info("执行查询居住地址的sql语句时间:" + endTimeSql+"ms");
|
|
|
+ log.info("执行查询居住地址的sql语句时间:" + endTimeSql + "ms");
|
|
|
packAddr(czrks);
|
|
|
return czrks;
|
|
|
/* List<String> idCardList = czrkJzdzService.listIdCard(czrkJzdz);
|
|
@@ -187,7 +187,41 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
long startTimeSql = System.currentTimeMillis();
|
|
|
List<Czrk> czrks = czrkMapper.listByRlry(czrk);
|
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
|
- log.info("执行查询sql语句时间:" + endTimeSql+"ms");
|
|
|
+ log.info("执行查询sql语句时间:" + endTimeSql + "ms");
|
|
|
+ packAddr(czrks);
|
|
|
+ return czrks;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询非正常人员列表(死亡,失踪)
|
|
|
+ *
|
|
|
+ * @param czrk
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public List<Czrk> unusualList(Czrk czrk) {
|
|
|
+ setAgeScope(czrk);
|
|
|
+ //获取到居住地的查询条件
|
|
|
+ Long provinceId = czrk.getProvinceIdXjd();
|
|
|
+ Long cityId = czrk.getCityIdXjd();
|
|
|
+ Long regionId = czrk.getRegionIdXjd();
|
|
|
+ Long villageTownsId = czrk.getVillageTownsIdXjd();
|
|
|
+ Long villageId = czrk.getVillageIdXjd();
|
|
|
+ CzrkJzdz czrkJzdz = new CzrkJzdz();
|
|
|
+ czrkJzdz.setProvinceId(provinceId);
|
|
|
+ czrkJzdz.setCityId(cityId);
|
|
|
+ czrkJzdz.setRegionId(regionId);
|
|
|
+ czrkJzdz.setTownId(villageTownsId);
|
|
|
+ czrkJzdz.setVillageId(villageId);
|
|
|
+ czrk.setCzrkJzdz(czrkJzdz);
|
|
|
+ //设置查询列表权限
|
|
|
+ setDeptIdList(czrk);
|
|
|
+ startPage();
|
|
|
+ long startTimeSql = System.currentTimeMillis();
|
|
|
+ //todo 重新写个接口查询状态值 != 1的数据
|
|
|
+ List<Czrk> czrks = czrkMapper.listByRlryJzdz(czrk);
|
|
|
+ long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
|
+ log.info("执行查询居住地址的sql语句时间:" + endTimeSql + "ms");
|
|
|
packAddr(czrks);
|
|
|
return czrks;
|
|
|
}
|
|
@@ -534,23 +568,41 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
*/
|
|
|
@Override
|
|
|
public AjaxResult changeCzrk(Czrk czrk) {
|
|
|
- //判断一下身份证号码是否存在
|
|
|
- String idCard = czrk.getIdCard();
|
|
|
- if (StringUtils.isBlank(idCard)) {
|
|
|
- return AjaxResult.error("身份证号码不存在");
|
|
|
+ //判断一下id是否存在
|
|
|
+ Long id = czrk.getId();
|
|
|
+ if (id == null) {
|
|
|
+ return AjaxResult.error("未获取到人员id");
|
|
|
}
|
|
|
//如果是迁出,则放到待认领中
|
|
|
String status = czrk.getStatus();
|
|
|
if (StringUtils.isNotBlank(status) && "2".equals(status)) {
|
|
|
- //
|
|
|
- czrkMapper.selectCzrkByIdCard(idCard);
|
|
|
-
|
|
|
+ //根据id查询出这个人信息
|
|
|
+ Czrk czrkQianchu = czrkMapper.selectCzrkById(id);
|
|
|
+ //先保存这个人的信息,当做历史记录
|
|
|
+ czrkChangeMapper.insertCzrkChange(czrkQianchu);
|
|
|
+ czrkQianchu.setIsRl("否");
|
|
|
+ czrkQianchu.setRlr("");
|
|
|
+ czrkQianchu.setRlrNike("");
|
|
|
+ czrkMapper.updateCzrk(czrkQianchu);
|
|
|
+ return AjaxResult.success();
|
|
|
}
|
|
|
- czrkMapper.changeCzrk(czrk);
|
|
|
+ //接下来则放入其他状态中
|
|
|
//往czrk_change表中插入历史数据
|
|
|
czrkChangeMapper.insertCzrkChange(czrk);
|
|
|
-
|
|
|
- return AjaxResult.error();
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser();
|
|
|
+ if (loginUser != null) {
|
|
|
+ SysUser sysUser = loginUser.getSysUser();
|
|
|
+ if (sysUser != null) {
|
|
|
+ String userName = sysUser.getUserName();
|
|
|
+ czrk.setChangUser(userName);
|
|
|
+ czrk.setChangUserTime(DateUtils.getNowDate());
|
|
|
+ czrk.setChangNikeUser(sysUser.getNickName());
|
|
|
+ czrkMapper.changeCzrk(czrk);
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
+ return AjaxResult.error("变更失败:没有获取到登录人信息");
|
|
|
+ }
|
|
|
+ return AjaxResult.error("变更失败");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -584,7 +636,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
czrk.setCzrkJzdzList(czrkJzdzList);
|
|
|
//todo 重新计算年龄
|
|
|
String birthday = czrk.getBirthday();
|
|
|
- if (StringUtils.isNotBlank(birthday)){
|
|
|
+ if (StringUtils.isNotBlank(birthday)) {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
int age = czrk.getAge();
|
|
|
try {
|
|
@@ -751,7 +803,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String queryType, String houseType, String isConfirm) {
|
|
|
+ public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String userName, String queryType, String houseType, String isConfirm) {
|
|
|
Long areaId = null;
|
|
|
int type = 0, yrl = 0, wrl = 0;
|
|
|
if (ObjectUtils.isNotEmpty(provinceId)) {
|
|
@@ -773,11 +825,11 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
if (Czrk.HJ.equals(queryType)) {
|
|
|
// 户籍
|
|
|
- yrl = czrkMapper.stsByYrl(type, areaId, idCard, houseType, isConfirm);
|
|
|
- wrl = czrkMapper.stsByWrl(type, areaId, idCard, houseType, isConfirm);
|
|
|
+ yrl = czrkMapper.stsByYrl(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
+ wrl = czrkMapper.stsByWrl(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
} else {
|
|
|
// 常住
|
|
|
- List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, idCard, houseType, isConfirm);
|
|
|
+ List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
for (Czrk czrk : rls) {
|
|
|
if ("是".equals(czrk.getIsRl())) {
|
|
|
yrl++;
|