pom 误操作回滚

server/svr-authentication/pom.xml

@@ -10,7 +10,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>svr-authentication</artifactId>rred
    <artifactId>svr-authentication</artifactId>
    <dependencies>
        <!-- 支持Tomcat启动 -->

svr/svr-healthy-house/pom.xml

@@ -11,11 +11,11 @@
	</parent>
	<groupId>com.yihu.jw</groupId>
	<artifactId>healthy-house</artifactId>
	<artifactId>svr-healthy-house</artifactId>
	<version>${parent.version}</version>
	<packaging>jar</packaging>
	<name>healthy-house</name>
	<name>svr-healthy-house</name>
	<description>healthy-house for jw2.0</description>
@@ -125,5 +125,23 @@
	</dependencies>
	<build>
		<finalName>svr-healthy-house</finalName>
		<plugins>
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<configuration>
					<mainClass>com.yihu.HealthyHouseApplication</mainClass>
				</configuration>
			</plugin>
			<plugin>
				<artifactId>maven-compiler-plugin</artifactId>
				<configuration>
					<source>1.8</source>
					<target>1.8</target>
				</configuration>
			</plugin>
		</plugins>
	</build>
</project>

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

@@ -7,6 +7,7 @@ import com.yihu.jw.healthyhouse.service.user.LoginService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ import java.util.Map;
 * @author HZY
 * @created 2018/9/18 19:55
 */
@Api(value = "LoginController", description = "登录", tags = {"登录"})
@RestController
public class LoginController extends EnvelopRestEndpoint {
@@ -40,6 +42,7 @@ public class LoginController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService;
    /******************************************    用户相关    **********************************/
    /**
     * 获取验证码
     * @param parameters
@@ -136,4 +139,10 @@ public class LoginController extends EnvelopRestEndpoint {
        }
    }
    /***************************  管理员相关 **************************************/
}

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

@@ -9,6 +9,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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@ import java.util.Map;
 * @author HZY
 * @created 2018/9/19 17:29
 */
@Api(value = "UserController", description = "用户信息", tags = {"用户"})
@RequestMapping("/user")
@RestController
public class UserController  extends EnvelopRestEndpoint {
@@ -72,7 +74,7 @@ public class UserController  extends EnvelopRestEndpoint {
    public Envelop activeUser(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "operator", value = "操作者", required = true)@RequestParam(required = true, name = "operator") String operator ) {
         userService.updateStatus(userId,operator, HouseUserContant.activated_active);
         userService.updateStatus(userId,operator, HouseUserContant.activated_active,null);
        return ObjEnvelop.getSuccess("激活成功");
    }
@@ -85,8 +87,10 @@ public class UserController  extends EnvelopRestEndpoint {
    @GetMapping("/freezeUser")
    public Envelop freezeUser(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "reason", value = "冻结原因", required = true)@RequestParam(required = true, name = "reason") String reason ,
            @ApiParam(name = "operator", value = "操作者", required = true)@RequestParam(required = true, name = "operator") String operator ) {
        userService.updateStatus(userId,operator, HouseUserContant.activated_lock);
        userService.updateStatus(userId,operator, HouseUserContant.activated_lock,reason);
        return ObjEnvelop.getSuccess("冻结成功");
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/User.java

@@ -38,6 +38,8 @@ public class User extends UuidIdentityEntityWithOperator {
    private String userType;         //用户类型
    @Column(name = "activated", nullable = false)
    private Integer activated;       //用户状态 0冻结，1激活
    @Column(name = "activated_content", nullable = false)
    private String activatedContent;       //账户冻结原因
    @Column(name = "province_code", nullable = false)
    private String provinceCode;    //省编码
    @Column(name = "city_code", nullable = false)
@@ -168,4 +170,12 @@ public class User extends UuidIdentityEntityWithOperator {
    public void setFacilityUsedCount(String facilityUsedCount) {
        this.facilityUsedCount = facilityUsedCount;
    }
    public String getActivatedContent() {
        return activatedContent;
    }
    public void setActivatedContent(String activatedContent) {
        this.activatedContent = activatedContent;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -89,15 +89,18 @@ public class UserService {
    /**
     * 更改用户状态
     * @param codes        待删除code
     * @param id            待删除id
     * @param userCode     修改者code
     */
     * @param status        更改状态
     * @param reason        更改状态原因
     * */
    @Transactional
    public void updateStatus(String id, String userCode,Integer status) {
    public void updateStatus(String id, String userCode,Integer status,String reason) {
        User user = userDao.findByLoginCode(userCode);
        String userName = user.getName();
            User user1 = findById(id);
            user1.setActivated(status);
            user1.setActivatedContent(reason);
            user1.setUpdateUserName(userName);
            user1.setUpdateUser(userCode);
            userDao.save(user1);
@@ -138,4 +141,8 @@ public class UserService {
            return Envelop.getSuccess("修改成功");
        }
    }
}

svr/svr-healthy-house/src/main/resources/application.yml

@@ -81,6 +81,10 @@ fastDFS:
---
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/