时间格式 用户新增

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@@ -10,6 +10,7 @@ import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.wlyy.HouseUserContant;
import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -85,15 +86,19 @@ public class UserController  extends EnvelopRestEndpoint {
        return ObjEnvelop.getSuccess("获取成功",userStatistics);
    }
    @PostMapping("/activateUser")
    @ApiOperation(value = "用户激活")
    public Envelop activeUser(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "operator", value = "操作者ID", required = true)@RequestParam(required = true, name = "operator") String operator ) throws ManageException {
         userService.updateStatus(userId,operator, HouseUserContant.activated_active,null);
        return ObjEnvelop.getSuccess("激活成功");
    }
    @ApiOperation(value = "新增/更新（idy已存在）用户信息")
    @PostMapping(value = "saveOrUpdate")
    public ObjEnvelop<User> saveOrUpdateUser(
            @ApiParam(name = "user", value = "用户JSON结构")
            @RequestBody User user) throws Exception {
        if (org.apache.commons.lang3.StringUtils.isEmpty(user.getName())) {
            return failed("用户名称不能为空！", ObjEnvelop.class);
        }
        user = userService.save(user);
        return success(user);
    }
    @PostMapping("/freezeUser")
    @ApiOperation(value = "用户冻结")
@@ -107,6 +112,15 @@ public class UserController  extends EnvelopRestEndpoint {
    }
    @PostMapping("/activateUser")
    @ApiOperation(value = "用户激活")
    public Envelop activeUser(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "operator", value = "操作者ID", required = true)@RequestParam(required = true, name = "operator") String operator ) throws ManageException {
        userService.updateStatus(userId,operator, HouseUserContant.activated_active,null);
        return ObjEnvelop.getSuccess("激活成功");
    }
    @PostMapping("/updatePwd")
    @ApiOperation(value = "更新密码")
    public Envelop updatePwd(

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facility/FacilityService.java

@@ -123,15 +123,16 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
                row=j+1;
                ExcelUtils.addCellData(sheet,0,row,j+1+"");//序号
                ExcelUtils.addCellData(sheet,1,row, metaData.getCode());//设施编码
                ExcelUtils.addCellData(sheet,2,row, metaData.getCategory().toString());//类型名称
                ExcelUtils.addCellData(sheet,3,row, metaData.getAddress());//信息地址
                ExcelUtils.addCellData(sheet,4,row, metaData.getUserName());//联系人
                ExcelUtils.addCellData(sheet,5,row, metaData.getUserTelephone());//联系电话
                ExcelUtils.addCellData(sheet,6,row, metaData.getProvinceId());//省
                ExcelUtils.addCellData(sheet,7,row, metaData.getCityName());//市
                ExcelUtils.addCellData(sheet,8,row, metaData.getCountyName());//区县
                ExcelUtils.addCellData(sheet,9,row, metaData.getStreet());//街道
                ExcelUtils.addCellData(sheet,10,row, metaData.getStatus());//运营状态
                ExcelUtils.addCellData(sheet,2,row, metaData.getName());//设施名称
                ExcelUtils.addCellData(sheet,3,row, metaData.getCategory().toString());//类型名称
                ExcelUtils.addCellData(sheet,4,row, metaData.getAddress());//信息地址
                ExcelUtils.addCellData(sheet,5,row, metaData.getUserName());//联系人
                ExcelUtils.addCellData(sheet,6,row, metaData.getUserTelephone());//联系电话
                ExcelUtils.addCellData(sheet,7,row, metaData.getProvinceId());//省
                ExcelUtils.addCellData(sheet,8,row, metaData.getCityName());//市
                ExcelUtils.addCellData(sheet,9,row, metaData.getCountyName());//区县
                ExcelUtils.addCellData(sheet,10,row, metaData.getStreet());//街道
                ExcelUtils.addCellData(sheet,11,row, metaData.getStatus());//运营状态
            }
@@ -167,6 +168,7 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
            String townCode = baseTownService.getCodeByname(facilityMsg.getCounty());
            Integer categoryCode = systemDictEntryService.getDictEntryCodeByName("FacilityType",facilityMsg.getCategory());
            facility.setCode(genFacilityCode());
            facility.setName(facilityMsg.getName());
            facility.setCategory(categoryCode);
            facility.setCategoryValue(facilityMsg.getCategory());
            facility.setUserName(facilityMsg.getUserName());
@@ -212,7 +214,13 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
     * @return
     */
    public String genFacilityCode(){
        return "CSHF" + randomString(5);
        String code = "CSHF" + randomString(5);
        Facility facility = facilityDao.findByCode(code);
        while (facility!=null) {
            code = "CSHF" + randomString(5);
            facility = facilityDao.findByCode(code);
        }
        return code;
    }
    /**

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/util/facility/FacilityMsgReader.java

@@ -30,56 +30,56 @@ public class FacilityMsgReader extends AExcelReader {
                for (int i = 1; i <= rows; i++) {
                    facilityMsg = new FacilityMsg();
                    //设施编码
//                    if(null != getCellCont(sheet, i, 2)){
//                        //去除空格、回车、换行、制表符
//                        facilityMsg.setCode(replaceBlank(getCellCont(sheet, i, 1)));
//                    }else{
//                        facilityMsg.setCode(getCellCont(sheet, i, 1));
//                    }
                    //设施名称
                    if(null != getCellCont(sheet, i, 0)){
                        //去除空格、回车、换行、制表符
                        facilityMsg.setName(replaceBlank(getCellCont(sheet, i, 0)));
                    }else{
                        facilityMsg.setName(getCellCont(sheet, i, 0));
                    }
                    //设施类型名称
                    if(null != getCellCont(sheet, i, 0)){
                    if(null != getCellCont(sheet, i, 1)){
                        //去除空格、回车、换行、制表符
                        facilityMsg.setCategory(replaceBlank(getCellCont(sheet, i, 0)));
                        facilityMsg.setCategory(replaceBlank(getCellCont(sheet, i, 1)));
                    }else{
                        facilityMsg.setCategory(getCellCont(sheet, i, 0));
                        facilityMsg.setCategory(getCellCont(sheet, i, 1));
                    }
                    facilityMsg.setUserName(getCellCont(sheet, i, 1));
                    facilityMsg.setUserTelePhone(getCellCont(sheet, i, 2));
                    facilityMsg.setUserName(getCellCont(sheet, i, 2));
                    facilityMsg.setUserTelePhone(getCellCont(sheet, i, 3));
                    //省
                    if(null != getCellCont(sheet, i, 3)){
                    if(null != getCellCont(sheet, i, 4)){
                        //去除空格、回车、换行、制表符
                        facilityMsg.setProvince(replaceBlank(getCellCont(sheet, i, 3)));
                        facilityMsg.setProvince(replaceBlank(getCellCont(sheet, i, 4)));
                    }else{
                        facilityMsg.setProvince(getCellCont(sheet, i, 3));
                        facilityMsg.setProvince(getCellCont(sheet, i, 4));
                    }
                    //市
                    if(null != getCellCont(sheet, i, 4)){
                    if(null != getCellCont(sheet, i, 5)){
                        //去除空格、回车、换行、制表符
                        facilityMsg.setCity(replaceBlank(getCellCont(sheet, i, 4)));
                        facilityMsg.setCity(replaceBlank(getCellCont(sheet, i, 5)));
                    }else{
                        facilityMsg.setCity(getCellCont(sheet, i, 4));
                        facilityMsg.setCity(getCellCont(sheet, i, 5));
                    }
                    //区
                    if(null != getCellCont(sheet, i, 5)){
                    if(null != getCellCont(sheet, i, 6)){
                        //去除空格、回车、换行、制表符
                        facilityMsg.setCounty(replaceBlank(getCellCont(sheet, i, 5)));
                        facilityMsg.setCounty(replaceBlank(getCellCont(sheet, i, 6)));
                    }else{
                        facilityMsg.setCounty(getCellCont(sheet, i, 5));
                        facilityMsg.setCounty(getCellCont(sheet, i, 6));
                    }
                    facilityMsg.setStreet(getCellCont(sheet, i, 6));
                    facilityMsg.setStatus(getCellCont(sheet, i, 7));
                    facilityMsg.setOrgName(getCellCont(sheet, i, 8));
                    facilityMsg.setServiceDate(getCellCont(sheet, i, 9));
                    facilityMsg.setServiceStartTime(getCellCont(sheet, i, 10));
                    facilityMsg.setServiceEndTime(getCellCont(sheet, i, 11));
                    facilityMsg.setLongitude(getCellCont(sheet, i, 12));
                    facilityMsg.setLatitude(getCellCont(sheet, i, 13));
                    facilityMsg.setStreet(getCellCont(sheet, i, 7));
                    facilityMsg.setStatus(getCellCont(sheet, i, 8));
                    facilityMsg.setOrgName(getCellCont(sheet, i, 9));
                    facilityMsg.setServiceDate(getCellCont(sheet, i, 10));
                    facilityMsg.setServiceStartTime(getCellCont(sheet, i, 11));
                    facilityMsg.setServiceEndTime(getCellCont(sheet, i, 12));
                    facilityMsg.setLongitude(getCellCont(sheet, i, 13));
                    facilityMsg.setLatitude(getCellCont(sheet, i, 14));
                    facilityMsg.setExcelSeq(i);
                    correctLs.add(facilityMsg);

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/util/facility/msg/FacilityMsg.java

@@ -52,10 +52,11 @@ public class FacilityMsg extends ExcelUtil implements Validation {
    String longitude; //经度
    @Location(x=15)
    String latitude; //纬度
    @Location(x=16)
    String name; //设施名称
    int hashCode;
    @Override
    public int validate(Map<String, Set> repeatMap) {
        int rs = 1;
@@ -264,4 +265,12 @@ public class FacilityMsg extends ExcelUtil implements Validation {
    public void setLatitude(String latitude) {
        this.latitude = latitude;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}