上传bug修复

src/main/java/com/boot/security/server/controller/UserController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.boot.security.server.model.AdvertiserUserMap;
+import com.boot.security.server.model.BaseSettlement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -121,30 +122,30 @@ public class UserController {
 		return UserUtil.getLoginUser();
 	}
 
-	@ApiOperation(value = "获取广告商和用户的映射关系")
-	@GetMapping("/advertiserUserList")
+	@ApiOperation(value = "获取版权方和用户的映射关系")
+	@GetMapping("/copyrightUserList")
 	public PageTableResponse  getAdvertiserUserList(PageTableRequest request) {
 		return new PageTableHandler(new CountHandler() {
 			@Override
 			public int count(PageTableRequest request) {
-				return userDao.countAdvertiserUserMap(request.getParams());
+				return userDao.countCopyrightUserMap(request.getParams());
 			}
 		}, new ListHandler() {
 
 			@Override
-			public List<AdvertiserUserMap> list(PageTableRequest request) {
-				List<AdvertiserUserMap> list = userDao.getAdvertiserUserMap();
+			public List<BaseSettlement> list(PageTableRequest request) {
+				List<BaseSettlement> list = userDao.getCopyrightUserMap();
 				return list;
 			}
 		}).handle(request);
 	}
 
-	@ApiOperation(value = "改变广告商和用户的映射关系")
-	@PostMapping("/updateAdvertiserUserMap")
-	public void  updateAdvertiserUserMap(@RequestBody AdvertiserUserMap request) {
-		ArrayList<AdvertiserUserMap> advertiserUserMaps = new ArrayList<>();
-		advertiserUserMaps.add(request);
-		userDao.updateAdvertiserUserMap(request.getUserId(),advertiserUserMaps);
+	@ApiOperation(value = "改变版权方和用户的映射关系")
+	@PostMapping("/updateCopyrightUserMap")
+	public void  updateAdvertiserUserMap(@RequestBody BaseSettlement request) {
+		ArrayList<BaseSettlement> baseSettlement = new ArrayList<>();
+		baseSettlement.add(request);
+		userDao.updateBaseSettlementUserMap(request.getUserId(),baseSettlement);
 	}
 
 	@ApiOperation(value = "根据用户id获取用户")

src/main/java/com/boot/security/server/dao/UserDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.boot.security.server.model.AdvertiserUserMap;
+import com.boot.security.server.model.BaseSettlement;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,17 +22,17 @@ public interface UserDao {
 	@Insert("insert into sys_user(username, password, nickname, headImgUrl, phone, telephone, email, birthday, sex, status, createTime, updateTime) values(#{username}, #{password}, #{nickname}, #{headImgUrl}, #{phone}, #{telephone}, #{email}, #{birthday}, #{sex}, #{status}, now(), now())")
 	int save(SysUser user);
 
-	int insertAdvertiserUserMap(@Param("userId") Long userId, @Param("advertiserUserMap") List<AdvertiserUserMap> advertiserUserMap);
+	int insertCopyrightUserMap(@Param("userId") Long userId, @Param("copyrightUserMap") List<BaseSettlement> baseSettlement);
 
 	@Select("select * from sys_user t where t.id = #{id}")
 	SysUser getById(Long id);
 
 	//查询所有的广告商
-	@Select("select advertiser_id as advertiserId,advertiser_name as advertiserName  from advert_list t group by advertiser_id,advertiser_name")
-	List<AdvertiserUserMap> getAdvertiser();
+	@Select("SELECT a.copyright_id as copyrightId,a.copyright_name as copyrightName FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name")
+	List<BaseSettlement> getCopyrightAll();
 
 	//查询广告商用户的映射关系
-	List<AdvertiserUserMap> getAdvertiserUserMap();
+	List<BaseSettlement> getCopyrightUserMap();
 
 	@Select("select * from sys_user t where t.username = #{username}")
 	SysUser getUser(String username);
@@ -41,7 +42,7 @@ public interface UserDao {
 
 	Integer count(@Param("params") Map<String, Object> params);
 
-	Integer countAdvertiserUserMap(@Param("params") Map<String, Object> params);
+	Integer countCopyrightUserMap(@Param("params") Map<String, Object> params);
 
 	List<SysUser> list(@Param("params") Map<String, Object> params, @Param("offset") Integer offset,
 			@Param("limit") Integer limit);
@@ -51,7 +52,7 @@ public interface UserDao {
 
 	int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List<Long> roleIds);
 
-	int updateAdvertiserUserMap(@Param("userId") Long userId, @Param("advertiserUserMap") List<AdvertiserUserMap> advertiserUserMap);
+	int updateBaseSettlementUserMap(@Param("userId") Long userId, @Param("baseSettlement") List<BaseSettlement> baseSettlements);
 
 	int update(SysUser user);
 }

src/main/java/com/boot/security/server/model/BaseSettlement.java

@@ -4,7 +4,8 @@ package com.boot.security.server.model;
 
 public class BaseSettlement extends BaseEntity<Long>{
 
-	public Integer userId;
+	public Long userId;
+	public String nickname;
 	public String reportDate;
 	public Integer copyrightId;
 	public String copyrightName;
@@ -29,11 +30,19 @@ public class BaseSettlement extends BaseEntity<Long>{
 	public Integer status;
 	public String statusName;
 
-	public Integer getUserId() {
+	public String getNickname() {
+		return nickname;
+	}
+
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public Long getUserId() {
 		return userId;
 	}
 
-	public void setUserId(Integer userId) {
+	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
 

src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java

@@ -2,7 +2,7 @@ package com.boot.security.server.service.impl;
 
 import java.util.List;
 
-import com.boot.security.server.model.AdvertiserUserMap;
+import com.boot.security.server.model.BaseSettlement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +35,8 @@ public class UserServiceImpl implements UserService {
 		user.setStatus(Status.VALID);
 		userDao.save(user);
 		saveUserRoles(user.getId(), userDto.getRoleIds());
-		List<AdvertiserUserMap> advertiser = userDao.getAdvertiser();
-		userDao.insertAdvertiserUserMap(userDto.getId(),advertiser);
+		List<BaseSettlement> copyright = userDao.getCopyrightAll();
+		userDao.insertCopyrightUserMap(userDto.getId(),copyright);
 		log.debug("新增用户{}", user.getUsername());
 		return user;
 	}

src/main/resources/mybatis-mappers/UserMapper.xml

@@ -22,17 +22,17 @@
 		<include refid="where" />
 	</select>
 
-	<select id="countAdvertiserUserMap" resultType="int">
+	<select id="countCopyrightUserMap" resultType="int">
 		SELECT count(1)
-		FROM advertiser_user_map a INNER JOIN sys_user b
+		FROM user_copyright_map a INNER JOIN sys_user b
 		ON a.user_id=b.id
 	</select>
 
-	<select id="getAdvertiserUserMap" resultType="com.boot.security.server.model.AdvertiserUserMap">
-		SELECT user_id as userId,nickname,advertiser_id as advertiserId,advertiser_name as advertiserName,a.status as status
-		FROM advertiser_user_map a INNER JOIN sys_user b
+	<select id="getCopyrightUserMap" resultType="com.boot.security.server.model.AdvertiserUserMap">
+		SELECT user_id as userId,nickname,copyright_id as copyrightId,copyright_name as copyrightName,a.status as status
+		FROM user_copyright_map a INNER JOIN sys_user b
 		ON a.user_id=b.id
-		ORDER BY user_id,advertiser_id
+		ORDER BY userId,copyrightId
 	</select>
 
 	<select id="list" resultType="SysUser">
@@ -49,20 +49,20 @@
 		</foreach>
 	</insert>
 
-	<insert id="insertAdvertiserUserMap">
-		insert into advertiser_user_map(user_id,advertiser_id, advertiser_name,status) values
-		<foreach collection="advertiserUserMap" item="advertiser" separator=",">
-			(#{userId},#{advertiser.advertiserId},#{advertiser.advertiserName},#{advertiser.status})
+	<insert id="insertCopyrightUserMap">
+		insert into user_copyright_map(user_id,copyright_id, copyright_name) values
+		<foreach collection="copyrightUserMap" item="copyright" separator=",">
+			(#{userId},#{copyright.copyrightId},#{copyright.copyrightName})
 		</foreach>
 	</insert>
 
-	<update id="updateAdvertiserUserMap">
-		<foreach collection="advertiserUserMap" item="advertiser" separator=",">
-			update advertiser_user_map
+	<update id="updateBaseSettlementUserMap">
+		<foreach collection="baseSettlementMap" item="baseSettlement" separator=",">
+			update user_copyright_map
 			<set>
-				status=#{advertiser.status}
+				status=#{baseSettlement.status}
 			</set>
-			where user_id = #{userId} and advertiser_id=#{advertiser.advertiserId}
+			where user_id = #{userId} and copyright_id=#{baseSettlement.copyrightId}
 		</foreach>
 	</update>
 

src/main/resources/static/pages/user/UserCopyrightMap.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>广告商负责人设置</title>
+<title>版权方负责人设置</title>
 <link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
 <link rel="stylesheet" type="text/css" media="screen" href="../../css/dataTables.bootstrap.min.css">
 <link rel="stylesheet" type="text/css" media="screen" href="../../layui/css/layui.css">
@@ -16,7 +16,7 @@
                                     <th>版权方</th>
                                 </tr>
                                 </thead>
-                                <tbody id="advertiserTable">
+                                <tbody id="copyrightTable">
                                 </tbody>
                             </table>
                         </div>
@@ -39,38 +39,34 @@ layui.use('form', function() {
     form.on('checkbox(formCheckbox)', function(data){
         var elem=data.elem;
         if(elem.checked){
-            changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("advertiserId"),elem.getAttribute("title"),1)
+            changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("copyrightId"),elem.getAttribute("title"),1)
         }else {
-            changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("advertiserId"),elem.getAttribute("title"),0)
+            changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("copyrightId"),elem.getAttribute("title"),0)
         }
     });
 });
 
 var pers = checkPermission();
 
-var table=$("#advertiserTable");
+var table=$("#copyrightTable");
 
 
 
 function setTable(data) {
     var str="";
     if(data[0].status===0){
-        str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\"  title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\">";
-        //table.append("<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\"  title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\">");
+        str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[0].copyrightId+"\"  title=\""+data[0].copyrightName+"\" userId=\""+data[0].userId+"\">";
     }else if(data[0].status==1){
-        str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\"  title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\"checked>";
-        //table.append("<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\"  title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\"checked>");
+        str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[0].copyrightId+"\"  title=\""+data[0].copyrightName+"\" userId=\""+data[0].userId+"\"checked>";
     }
 
     var id=data[0].userId;
     for(var i=1;i<data.length;i++){
         if(id==data[i].userId){
             if(data[i].status===0){
-                str+="<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">";
-                //table.append("<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">");
+                str+="<input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[i].copyrightId+"\"  title=\""+data[i].copyrightName+"\" userId=\""+data[i].userId+"\">";
             }else if(data[i].status==1){
-                str+="<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>";
-                //table.append("<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>");
+                str+="<input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[i].copyrightId+"\"  title=\""+data[i].copyrightName+"\" userId=\""+data[i].userId+"\"checked>";
             }
         }else{
             id=data[i].userId;
@@ -78,20 +74,17 @@ function setTable(data) {
             if(data[i].status===0){
                 str+="</td></tr>";
                 table.append(str);
-                str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">";
-                //table.append("<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">");
+                str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[i].copyrightId+"\"  title=\""+data[i].copyrightName+"\" userId=\""+data[i].userId+"\">";
             }else if(data[i].status==1){
                 str+="</td></tr>";
                 table.append(str);
-                str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>";
-                //table.append("<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\"  title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>");
+                str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" copyrightId=\""+data[i].copyrightId+"\"  title=\""+data[i].copyrightName+"\" userId=\""+data[i].userId+"\"checked>";
             }
         }
 
     }
     str+="</td></tr>";
     table.append(str);
-    //table.append("</td></tr>")
 
 }
 
@@ -104,7 +97,7 @@ function init(){
         //请求的媒体类型
         contentType: "application/json;charset=UTF-8",
         //请求地址
-        url : "/users/advertiserUserList",
+        url : "/users/copyrightUserList",
         async:false,
         //数据，json字符串
         //data : JSON.stringify(list),
@@ -120,21 +113,21 @@ function init(){
     });
 }
 
-function changeAdvertiserUserMap(userId,advertiserId,advertiserName,status){
-    var str={userId:userId,advertiserId:advertiserId,advertiserName:advertiserName,status:status};
+function changeAdvertiserUserMap(userId,copyrightId,copyrightName,status){
+    var str={userId:userId,copyrightId:copyrightId,copyrightName:copyrightName,status:status};
     $.ajax({
         //请求方式
         type : "post",
         //请求的媒体类型
         contentType: "application/json;charset=UTF-8",
         //请求地址
-        url : "/users/updateAdvertiserUserMap",
+        url : "/users/updateCopyrightUserMap",
         async:true,
         //数据，json字符串
         data : JSON.stringify(str),
         //请求成功
         success : function(result) {
-            console.log("修改所属广告商成功");
+            console.log("修改成功");
         },
         //请求失败，包含具体的错误信息
         error : function(e){