Skip to content

Z
znks
Commit b8cae1c8 authored by leyboy's avatar leyboy
Browse files
Options

1.管理员逻辑修改

parent 6a04a8f7
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 80 deletions
.idea/workspace.xml
View file @ b8cae1c8
......@@ -8,6 +8,11 @@
<component name="ChangeListManager">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" />
</list>
<ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -139,11 +144,6 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/LockRecordService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" />
......@@ -152,6 +152,11 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" />
</list>
</option>
</component>
......@@ -662,6 +667,81 @@
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="service" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -937,7 +1017,7 @@
<workItem from="1536837981631" duration="137000" />
<workItem from="1536838164874" duration="2991000" />
<workItem from="1536885579712" duration="12549000" />
<workItem from="1536901590633" duration="11166000" />
<workItem from="1536901590633" duration="13700000" />
</task>
<task id="LOCAL-00001" summary="A">
<created>1534412427208</created>
......@@ -1065,7 +1145,14 @@
<option name="project" value="LOCAL" />
<updated>1536914595566</updated>
</task>
<option name="localTasksCounter" value="19" />
<task id="LOCAL-00019" summary="1.用户记录查询增加模糊查询">
<created>1536914692273</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1536914692273</updated>
</task>
<option name="localTasksCounter" value="20" />
<servers />
</component>
<component name="TestHistory">
......@@ -1083,7 +1170,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="332805000" />
<option name="totallyTimeSpent" value="335339000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -1445,35 +1532,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="37" column="49" lean-forward="false" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201">
<caret line="70" column="54" lean-forward="false" selection-start-line="70" selection-start-column="54" selection-end-line="70" selection-end-column="54" />
<folding>
<element signature="e#1682#1683#0" expanded="false" />
<element signature="e#1734#1735#0" expanded="false" />
<element signature="e#2233#2234#0" expanded="false" />
<element signature="e#2296#2297#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="59" column="18" lean-forward="false" selection-start-line="59" selection-start-column="18" selection-end-line="59" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213">
......@@ -1539,14 +1597,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="96" column="21" lean-forward="false" selection-start-line="96" selection-start-column="21" selection-end-line="96" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
......@@ -1635,19 +1685,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
<folding>
<element signature="e#1604#1608#0" expanded="true" />
<marker date="1536901861727" expanded="true" signature="631:873" ph="update tb_admin... " />
<marker date="1536901861727" expanded="true" signature="986:1058" ph="select * fro... tb_admin" />
<marker date="1536901861727" expanded="true" signature="986:1060" ph="select from tb_admin" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-44">
......@@ -1656,14 +1693,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="34" column="34" lean-forward="true" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
......@@ -1692,6 +1721,69 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="22" column="26" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="26" />
<folding>
<element signature="e#1125#1126#0" expanded="true" />
<element signature="e#1155#1156#0" expanded="true" />
<element signature="e#1201#1202#0" expanded="true" />
<element signature="e#1239#1240#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="25" column="20" lean-forward="false" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
<folding>
<element signature="e#1705#1709#0" expanded="true" />
<marker date="1536916334169" expanded="true" signature="631:907" ph="update tb_admin... " />
<marker date="1536916334169" expanded="true" signature="1087:1159" ph="select * fro... tb_admin" />
<marker date="1536916334169" expanded="true" signature="1087:1161" ph="select from tb_admin" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="24" column="2" lean-forward="true" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="46" column="41" lean-forward="false" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="60" column="64" lean-forward="false" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
<folding>
<element signature="e#1731#1732#0" expanded="true" />
<element signature="e#1783#1784#0" expanded="true" />
<element signature="e#2313#2314#0" expanded="true" />
<element signature="e#2376#2377#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java
View file @ b8cae1c8
......@@ -59,10 +59,10 @@ public class AdminController {
}
@DeleteMapping("/admin/{adminId}")
public ResponseEntity deleteOne(@PathVariable String adminId) {
@DeleteMapping("/admin/{adminName}")
public ResponseEntity deleteOne(@PathVariable String adminName) {
try {
int result = adminService.deleteAdmin(adminId);
int result = adminService.deleteAdmin(adminName);
if(result==1){
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"删除成功",true);
......
adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java
View file @ b8cae1c8
......@@ -13,13 +13,13 @@ import java.util.List;
@Mapper
public interface AdminDao {
@Insert("insert into tb_admin(admin_name,admin_password,create_time) " +
"values(#{name},#{password},#{createTime})")
@Insert("insert into tb_admin(admin_id,admin_name,admin_password,create_time) " +
"values(#{adminId},#{name},#{password},#{createTime})")
int insertAdmin(Admin admin);
@Delete("delete from tb_admin where admin_id = #{adminId}")
int deleteAdmin(@Param("adminId") String adminId);
@Delete("delete from tb_admin where admin_name = #{adminName}")
int deleteAdmin(@Param("adminName") String adminName);
int updateAdmin(Admin admin);
......@@ -32,7 +32,8 @@ public interface AdminDao {
@Results({
@Result(column = "create_time", property = "createTime"),
@Result(column = "admin_name", property = "name"),
@Result(column = "admin_password", property = "password")
@Result(column = "admin_password", property = "password"),
@Result(column = "admin_id",property = "adminId")
}
)
Admin findAdminByAdminName(String adminName);
......
adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java
View file @ b8cae1c8
......@@ -20,6 +20,8 @@ public class Admin {
private transient String plainPassword;
private String adminId;
public Admin() {
}
......@@ -56,6 +58,14 @@ public class Admin {
}
public String getAdminId() {
return adminId;
}
public void setAdminId(String adminId) {
this.adminId = adminId;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("{");
......@@ -65,6 +75,8 @@ public class Admin {
.append(password).append('\"');
sb.append(",\"createTime\":\"")
.append(createTime).append('\"');
sb.append(",\"adminId\":\"")
.append(adminId).append('\"');
sb.append('}');
return sb.toString();
}
......
adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java
View file @ b8cae1c8
......@@ -36,6 +36,7 @@ public class AdminService {
public int insertAdmin(Admin admin) {
Admin findAdmin = adminDao.findAdminByAdminName(admin.getName());
if (findAdmin == null) {
admin.setAdminId(UUID.randomUUID());
admin.setCreateTime(new Date(System.currentTimeMillis()));
if (StringUtils.hasText(admin.getPlainPassword())) {
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
......@@ -58,12 +59,13 @@ public class AdminService {
Admin findAdmin = adminDao.findAdminByAdminName(admin.getName());
if (findAdmin != null) {
if (StringUtils.hasText(admin.getPlainPassword())) {
admin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
findAdmin.setPassword(Base64Utils.encode(admin.getPlainPassword().getBytes(Charset.defaultCharset())));
}
return adminDao.updateAdmin(admin);
return adminDao.updateAdmin(findAdmin);
}else{
//没有查询到,更新失败
return -1;
}
//没有查询到,更新失败
return -1;
}
......
adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml
View file @ b8cae1c8
......@@ -15,13 +15,16 @@
<update id="updateAdmin" parameterType="com.adc.da.znks.entity.Admin">
update tb_admin
<set>
<if test="name != null">
<if test="name != null and name != ''">
admin_name = #{name},
</if>
<if test="password != null">
<if test="password != null and password != ''">
admin_password = #{password},
</if>
</set>
<where>
admin_id = #{adminId}
</where>
</update>
<select id="listAdminsByCondition" parameterType="object" resultMap="BaseResultMap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment