t_jksbgl(监控设备)---修改

develop
Angel 10 months ago
parent 237b7a8c31
commit 23fd1e11a6

@ -6,3 +6,6 @@ oncesCounts=10000
syfwSwitch=false
syrkSwitch=false
jksbSwitch=true

@ -11,6 +11,7 @@ import lombok.Data;
*/
@Data
public class TJksbglMysql {
/**
*

@ -1,30 +0,0 @@
package com.ssf.mysqloracletest.domain;
import lombok.Data;
/**
* village_send_vehicle_record
*
*/
@Data
public class VillageSendRecordStatic {
private String id;
private String villageCode;
private String villageName;
private String deviceCode;
private String tableName;
private String tableId;
private String sendTime;
private String receiveTime;
private String manufactorNo;
private String receiptId;
private String resultStatus;
private String resultRemark;
private String isactive;
private String c1;
private String c2;
private String c3;
private String c4;
private String c5;
}

@ -1,397 +0,0 @@
package com.ssf.mysqloracletest.domain;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* village_user_info
*
* @author ruoyi
*/
@Data
public class VillageUserInfo {
private static final long serialVersionUID = 1L;
/**
*
*/
private Long id;
/**
*
*/
private String villageCode;
/**
*
*/
//@Excel(name = "小区名称*")
private String villageName;
/**
*
*/
//@Excel(name = "网格名称*")
private String gridName;
/**
*
*/
//@Excel(name = "楼栋名称*")
private String buildingName;
/**
*
*/
//@Excel(name = "单元名称*")
private String unitName;
/**
*
*/
//@Excel(name = "房屋名称*")
private String homeName;
/**
*
*/
//@Excel(name = "住户姓名*")
private String userName;
/**
*
*/
//@Excel(name = "人员类型*", comboWt = "person_type")
private String personTypeCn;
/**
*
*/
//@Excel(name = "证件类型", comboWt = "identity_type")
private String identityTypeCn;
/**
*
*/
//@Excel(name = "证件号码*")
private String idcard;
/**
*
*/
//@Excel(name = "人员类别*", comboWt = "person_category")
private String personCategoryCn;
/**
*
*/
//@Excel(name = "联系电话")
private String phone;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
//@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthday;
/**
*
*/
//@Excel(name = "关爱人员标签", comboWt = "caring_label")
private String caringLabelCn;
/**
*
*/
//@Excel(name = "是否户主*", comboWt = "is_householder")
private String isHouseholderCn;
/**
*
*/
//@Excel(name = "与户主关系*", comboWt = "householder_relation")
private String householderRelationCn;
/**
*
*/
//@Excel(name = "性别", comboWt = "sex")
private String sexCn;
//@Excel(name = "民族", comboWt = "nation")
private String nationCn;
/**
*
*/
//@Excel(name = "国籍", comboWt = "nationality")
private String nationalityCn;
/**
*
*/
//@Excel(name = "籍贯" )
private String nativeplace;
/**
*
*/
//@Excel(name = "学历", comboWt = "education")
private String educationCn;
/**
*
*/
//@Excel(name = "政治面貌", comboWt = "political_outlook")
private String politicalOutlookCn;
/**
*
*/
//@Excel(name = "户籍")
private String houseHoldRegister;
/**
*
*/
//@Excel(name = "户籍地址")
private String houseHoldAddress;
/**
*
*/
//@Excel(name = "宗教信仰")
private String religious;
/**
*
*/
private String gridCode;
/**
*
*/
private String buildingCode;
/**
*
*/
private String unitCode;
/**
*
*/
private String homeCode;
/**
*
*/
private String userPic;
/**
*
*/
private String userStandardPic;
//标准图片是空参数
private String userStandardPicIsNull;
/**
*
*/
private Integer identityType;
private String idcardCn;
/**
*
*/
private Integer sex;
/**
*
*/
private Integer nation;
/**
*
*/
// //@Excel(name = "公司名称")
private String company;
private String phoneCn;
/**
*
*/
private Integer nationality;
/**
*
*/
private Integer education;
/**
*
*/
// //@Excel(name = "现居行政区编码")
private String areaCode;
/**
*
*/
// //@Excel(name = "现居行政区名称")
private String areaName;
/**
*
*/
// //@Excel(name = "实际居住地")
private String habitation;
/**
*
*/
private Integer politicalOutlook;
/**
*
*/
// //@Excel(name = "入境时间")
private Long entryTime;
/**
*
*/
private Integer marriage;
/**
*
*/
// //@Excel(name = "婚姻状况", comboWt = "marriage")
private String marriageCn;
/**
*
*/
private Integer personType;
/**
*
*/
private Integer personCategory;
/**
*
*/
private Integer caringLabel;
/**
*
*/
private Integer isHouseholder;
/**
*
*/
private Integer householderRelation;
/**
*
*/
private Integer isVaccinate;
/**
*
*/
private String isVaccinateCn;
/**
*
*/
private Integer isFirstVaccinate;
/**
*
*/
private String isFirstVaccinateCn;
/**
*
*/
private Integer isSecondVaccinate;
/**
*
*/
private String isSecondVaccinateCn;
/**
*
*/
private Integer isThirdVaccinate;
/**
*
*/
private String isThirdVaccinateCn;
private String createtime;
private String createby;
private String updatetime;
private String updateby;
/**
* 0:,1:
*/
private Integer isactive;
/**
* c1
*/
private String c1;
private String c1Cn;
//更新version字段
private String c2New;
/**
* c2
*/
private String c2;
/**
* c3
*/
private String c3;
/**
* c4
*/
private String c4;
/**
* c5
*/
private String c5;
private String idsIn;
private String idcardDesensitization;
private String phoneDesensitization;
//重点人类型
private String impUserType;
//多个重点人类型标签
private JSONObject impUserTypes;
private String impUserTypeCn;
private String imsi;
private Boolean isExport;
//人员全息 规则 排序字段: 有图且打好标记的最优先展示
private String orderByTomany;
/**
*
*/
private String reliability;
//是否重点人
private String isImpUser;
//是否全息档案请求
private String enabledArchives;
}

@ -1,48 +0,0 @@
package com.ssf.mysqloracletest.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.ssf.mysqloracletest.domain.VillageSendRecordStatic;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
@DS("mysql")
public interface VillageSendRecordStaticMapper {
/**
*
*
* @return
*/
int insertRecord(VillageSendRecordStatic villageSendRecordStatic);
/**
*
*
* @return
*/
int insertRecords(List<VillageSendRecordStatic> villageSendRecordStatic);
/**
*
*
* @return
*/
int updateRecord(VillageSendRecordStatic villageSendRecordStatic);
int updateRecordByTableId(VillageSendRecordStatic villageSendRecordStatic);
/**
*
*
* @param map
* @return
*/
Long getMaxTableIdFromVillageSendRecordStatic(Map<String, Object> map);
/**
*
*/
public List<VillageSendRecordStatic> getList(Map<String, Object> map);
}

@ -1,93 +0,0 @@
package com.ssf.mysqloracletest.mapper;
import com.ssf.mysqloracletest.domain.VillageUserInfo;
import java.util.List;
import java.util.Map;
/**
* Mapper
*
* @author ruoyi
* @date 2022-05-17
*/
public interface VillageUserInfoMapper {
/**
*
*
* @param id
* @return
*/
public VillageUserInfo selectVillageUserInfoById(Long id);
public VillageUserInfo selectVillageUserInfoByIdcard(String id);
/**
*
*
* @param villageUserInfo
* @return
*/
public List<VillageUserInfo> selectVillageUserInfoList(VillageUserInfo villageUserInfo);
/**
*
*
* @param villageUserInfo
* @return
*/
public List<VillageUserInfo> archivesList(VillageUserInfo villageUserInfo);
/**
*
*
* @param villageUserInfo
* @return
*/
public int insertVillageUserInfo(VillageUserInfo villageUserInfo);
public int saveOrUpdate(VillageUserInfo villageUserInfo);
/**
*
*
* @param villageUserInfo
* @return
*/
public int updateVillageUserInfo(VillageUserInfo villageUserInfo);
public int updateVillageUserInfoByIdcard(VillageUserInfo bean);
/**
*
*
* @param id
* @return
*/
public int deleteVillageUserInfoById(Long id);
public int deleteVillageUserInfoByUpdatetime(VillageUserInfo bean);
/**
*
*
* @param ids
* @return
*/
public int deleteVillageUserInfoByIds(String[] ids);
/**
*
*/
public int logicDelete(Map<String, Object> map);
/**
* 使
*/
public int deleteVillageUserInfo(Map<String, Object> map);
public List<VillageUserInfo> userArchivesTask(VillageUserInfo userInfo);
public List<VillageUserInfo> userArchivesTaskNotIn(VillageUserInfo userInfo);
}

@ -13,7 +13,7 @@ public interface TJksbglMysqlService {
public TJksbglMysql selectTJksbglById(String id);
public int insertTJksbgl(TJksbglMysql sydz);
public int insertTJksbgl(TJksbglMysql tjks);
public int updateTJksbglById(TJksbglMysql sydz);
public int updateTJksbglById(TJksbglMysql tjks);
}

@ -1,65 +0,0 @@
package com.ssf.mysqloracletest.service;
import com.ssf.mysqloracletest.domain.VillageUserInfo;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2022-05-17
*/
public interface VillageUserInfoService {
/**
*
*
* @param id
* @return
*/
public VillageUserInfo selectVillageUserInfoById(Long id);
/**
*
*
* @param villageUserInfo
* @return
*/
public List<VillageUserInfo> selectVillageUserInfoList(VillageUserInfo villageUserInfo);
public VillageUserInfo selectVillageUserInfoByIdcard(String idcard);
/**
*
*
* @param villageUserInfo
* @return
*/
public int insertVillageUserInfo(VillageUserInfo villageUserInfo);
/**
*
*
* @param villageUserInfo
* @return
*/
public int updateVillageUserInfo(VillageUserInfo villageUserInfo);
/**
*
*
* @param ids
* @return
*/
public int updateVillageUserInfoByIdcard(VillageUserInfo bean);
/**
*
*
* @param id
* @return
*/
public int deleteVillageUserInfoById(Long id);
}

@ -22,13 +22,13 @@ public class TJksbglMysqlServiceImpl implements TJksbglMysqlService {
}
@Override
public int insertTJksbgl(TJksbglMysql bean) {
return tjksbglMysqlMapper.insertTJksbgl(bean);
public int insertTJksbgl(TJksbglMysql tjks) {
return tjksbglMysqlMapper.insertTJksbgl(tjks);
}
@Override
public int updateTJksbglById(TJksbglMysql bean) {
return tjksbglMysqlMapper.updateTJksbglById(bean);
public int updateTJksbglById(TJksbglMysql tjks) {
return tjksbglMysqlMapper.updateTJksbglById(tjks);
}
}

@ -30,12 +30,12 @@ public class VSySyfwMysqlServiceImpl implements VSySyfwMysqlService {
@Override
public int insertVSySyfw(VSySyfwMysql syfw) {
return 0;
return sySyfwMysqlMapper.insertVSySyfw(syfw);
}
@Override
public int updateVSySyfwById(VSySyfwMysql syfw) {
return 0;
return sySyfwMysqlMapper.updateVSySyfwById(syfw);
}
}

@ -1,119 +0,0 @@
package com.ssf.mysqloracletest.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.ssf.mysqloracletest.domain.VillageUserInfo;
import com.ssf.mysqloracletest.mapper.VillageUserInfoMapper;
import com.ssf.mysqloracletest.service.VillageUserInfoService;
import com.ssf.mysqloracletest.utils.NumKit;
import com.ssf.mysqloracletest.utils.StringKit;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Service
*
* @author ruoyi
*/
@Service
@RequiredArgsConstructor
@DS("mysql")
public class VillageUserInfoServiceImpl implements VillageUserInfoService {
private static final Logger logger = LoggerFactory.getLogger(VillageUserInfoServiceImpl.class);
private final VillageUserInfoMapper villageUserInfoMapper;
/**
*
*
* @param id
* @return
*/
@Override
public VillageUserInfo selectVillageUserInfoById(Long id) {
VillageUserInfo v = villageUserInfoMapper.selectVillageUserInfoById(id);
return v;
}
/**
*
*
* @param villageUserInfo
* @return
*/
@Override
public List<VillageUserInfo> selectVillageUserInfoList(VillageUserInfo villageUserInfo) {
//查询之前加密
List<VillageUserInfo> list = villageUserInfoMapper.selectVillageUserInfoList(villageUserInfo);
return list;
}
/**
*
*
* @param villageUserInfo
* @return
*/
@Override
public int insertVillageUserInfo(VillageUserInfo villageUserInfo) {
try {
return villageUserInfoMapper.insertVillageUserInfo(villageUserInfo);
} catch (Exception e) {
logger.info(StringKit.getTrace(e));
return 0;
}
}
/**
*
*
* @param villageUserInfo
* @return
*/
@Override
public int updateVillageUserInfo(VillageUserInfo villageUserInfo) {
try {
return villageUserInfoMapper.updateVillageUserInfo(villageUserInfo);
} catch (Exception e) {
logger.info(StringKit.getTrace(e));
return 0;
}
}
@Override
public VillageUserInfo selectVillageUserInfoByIdcard(String idcard) {
VillageUserInfo v = villageUserInfoMapper.selectVillageUserInfoByIdcard(idcard);
return v;
}
@Override
public int updateVillageUserInfoByIdcard(VillageUserInfo bean) {
VillageUserInfo beanCheck = selectVillageUserInfoByIdcard(bean.getIdcard());
String versionCheck = StringKit.toString(beanCheck.getC2());
String c2 = "".equals(bean.getC2()) ? "1" : bean.getC2();
int version = NumKit.checkInt(c2);
bean.setC2(StringKit.toString(version));
bean.setC2New(StringKit.toString(version + 1));
if ("".equals(versionCheck) || c2.equals(versionCheck)) {
return villageUserInfoMapper.updateVillageUserInfoByIdcard(bean);
}
return 0;
}
/**
*
*
*/
@Override
public int deleteVillageUserInfoById(Long id) {
return villageUserInfoMapper.deleteVillageUserInfoById(id);
}
}

@ -12,6 +12,8 @@ public class ConfigParam {
public static String oncesCounts = StringKit.toString(PropertiesUtil.queryPropertiesByKey("oncesCounts"));
public static String syfwSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syfwSwitch"));
public static String jksbSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jksbSwitch"));
public static String syrkSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syrkSwitch"));
public static String jksbSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jksbSwitch"));
}

Loading…
Cancel
Save