Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/io/office/modules/manage/controller/NewsController.java

src/main/java/io/office/modules/manage/controller/NewsController.java

@@ -600,4 +600,45 @@ public class NewsController extends AbstractController {
     }
 
 
+    /**
+     * 深度专题
+     */
+    @Login
+    @RequestMapping("/api/sdztList")
+    // @RequiresPermissions("manage:product:findPage")
+    public R sdztList(@RequestBody NewsParams newsParams) {
+        Page<NewtopicEntity> page = this.newsService.sdztList(newsParams,
+                new Page(newsParams.getPage(), newsParams.getLimit()));
+        PageUtils pageUtils = new PageUtils(page);
+        return R.ok().put("data", pageUtils);
+    }
+
+    /**
+     * 精彩视频
+     */
+    @Login
+    @RequestMapping("/api/jcspList")
+    // @RequiresPermissions("manage:product:findPage")
+    public R jcspList(@RequestBody NewsParams newsParams) {
+        Page<NewsMovieEntity> page = this.newsService.jcspList(newsParams,
+                new Page(newsParams.getPage(), newsParams.getLimit()));
+        PageUtils pageUtils = new PageUtils(page);
+        return R.ok().put("data", pageUtils);
+    }
+    @Autowired
+    @Lazy
+    private NewsMovieService newsMovieService;
+    /**
+     *精彩视频详情
+     */
+    @Login
+    /**
+     * 信息
+     */
+    @RequestMapping("/api/jcspiInfo/{id}")
+    //  @RequiresPermissions("manage:newsmovie:info")
+    public R jcspiInfo(@PathVariable("id") Integer id){
+        NewsMovieEntity newsMovie = newsMovieService.getById(id);
+        return R.ok().put("data", newsMovie);
+    }
 }

src/main/java/io/office/modules/manage/dao/MemberDao.java

@@ -36,7 +36,7 @@ public interface MemberDao extends BaseMapper<MemberEntity> {
     @Select("select b.code_agen as code_agen from member a left join MemAgent b on a.username=b.user_id  where a.username=#{userName}")
     Integer selectCode_agen(@Param("userName") String userName);
 
-    @Select("INSERT INTO useraccess (UserName,GroupId,rights) values (#{userName},1,'100,')")
+    @Select("INSERT INTO useraccess (UserName,GroupId,rights,Credit) values (#{userName},1,'100,','70')")
     void insertUserAccess(@Param("userName")String userName);
 
     @Update("UPDATE member SET  phone = #{phone} WHERE id = #{id}")

src/main/java/io/office/modules/manage/dao/NewsDao.java

@@ -95,4 +95,12 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
     List<NewsEntity> relatedLinks(Map<String, Object> params);
 
     List<SearchVo> getSearchInfo(@Param("name") String name,@Param("type") String type, Page page);
+
+    List<NewsEntity> zhbdList(@Param("newsParams")NewsParams newsParams, Page page);
+
+    List<NewsEntity> bzkydtList(NewsParams newsParams, Page page);
+
+    List<NewtopicEntity> sdztList(NewsParams newsParams, Page page);
+
+    List<NewsMovieEntity> jcspList(NewsParams newsParams, Page page);
 }

src/main/java/io/office/modules/manage/dao/TycpdmFirmChangeDao.java

@@ -27,7 +27,7 @@ public interface TycpdmFirmChangeDao extends BaseMapper<TycpdmFirmChangeEntity>
     @Update("UPDATE tycpdm_firm_change SET logout_flag = #{logout_flag}, approve_date = #{date} ,approve_content=#{approve_content}  , auditor =#{username}  WHERE id = #{id}")
     void updateBYIdLogoutFlag(@Param("logout_flag") String logout_flag, @Param("id") String id,@Param("date") String date,@Param("username")String username,@Param("approve_content") String approve_content);
 
-    Integer findTycpdmFirmLogoutFlagCountALL(@Param("levels")Integer levels,@Param("logout_flag")Integer logout_flag);
+    Integer findTycpdmFirmLogoutFlagCountALL(@Param("levels")String levels,@Param("logout_flag")Integer logout_flag);
 
     List<TycpdmFirmChangeEntity> selectTycpdmFirmList(Map<String, Object> params, Page page);
 

src/main/java/io/office/modules/manage/dao/TycpdmFirmDao.java

@@ -23,7 +23,7 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> {
     @Select("select * from tycpdm_firm where base_user=#{userName} ")
    TycpdmFirmEntity findUserName(@Param("userName") String userName);
 
-    Integer findTycpdmFirmLogoutFlagCountALL(@Param("levels")Integer levels,@Param("logout_flag")Integer logout_flag);
+    Integer findTycpdmFirmLogoutFlagCountALL(@Param("levels")String levels,@Param("logout_flag")Integer logout_flag);
 
   /*  @Update("UPDATE tycpdm_firm SET  firmBusinessLicenseFile = #{firmBusinessLicenseFile} , logout_flag=#{logout_flag} WHERE f_id = #{id}")
     void updateByIdFirmBusinessLicenseFile(@Param("firmBusinessLicenseFile")String firmBusinessLicenseFile,@Param("id") Integer id,@Param("logout_flag")int logout_flag );

src/main/java/io/office/modules/manage/service/NewsService.java

@@ -93,5 +93,13 @@ public interface NewsService extends IService<NewsEntity> {
     List<NewsEntity> relatedLinks(Map<String, Object> params);
 
     Page<SearchVo> getSearchInfo(String name,String type, Page page);
+
+    Page<NewsEntity> zhbdList(NewsParams newsParams, Page page);
+
+    Page<NewsEntity> bzkydtList(NewsParams newsParams, Page page);
+
+    Page<NewtopicEntity> sdztList(NewsParams newsParams, Page page);
+
+    Page<NewsMovieEntity> jcspList(NewsParams newsParams, Page page);
 }
 

src/main/java/io/office/modules/manage/service/impl/MemberServiceImpl.java

@@ -6,6 +6,7 @@ import io.office.modules.manage.dao.*;
 import io.office.modules.manage.entity.*;
 import io.office.modules.manage.utils.DateUtils;
 import io.office.modules.manage.utils.MD5Util;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.dom4j.Document;
@@ -31,7 +32,7 @@ import javax.servlet.http.HttpSession;
 
 
 @Service("memberService")
-
+@Slf4j
 public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> implements MemberService {
 
     @Autowired
@@ -67,6 +68,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
 
     @Override
     public void userRegistered(Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) {
+        log.info("注册IP为："+IPUtils.getIpAddr(request));
         String userName = params.get("userName") == null ? "" : String.valueOf(params.get("userName"));
         String emiail = params.get("e-miail") == null ? "" : String.valueOf(params.get("e-miail"));
         String phone = params.get("phone") == null ? "" : String.valueOf(params.get("phone"));
@@ -75,7 +77,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
         String passWord_repeat = params.get("passWord_repeat") == null ? "" : String.valueOf(params.get("passWord_repeat")); //重复密码
         //判断用户名合法性
         if (!checkUserName(userName)) {
-            throw new RRException("用户名不能是纯数字,长度2-8位");
+            throw new RRException("用户名必须由数字和字母组成且不能是纯数字,长度2-8位");
         }
         //判断密码合法性
         if (!checkPassWord(passWord)) {
@@ -93,6 +95,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
         if (!matchPhoneNumber(phone)) {
             throw new RRException("手机格式不正确,请重新填写");
         }
+        //判断用户名是否存在
+        MemberEntity memberEntityName = memberDao.selectByName(userName);
+        if (memberEntityName!=null){
+            throw new RRException("用户名已存在");
+        }
         //利用获取验证码时保存的session，判断手机验证码非空，和发送的短信内容是否一致，提交时的手机号与接收验证码的手机号是否相同，验证码是否已失效
 
         ValueOperations forValue = redisTemplate.opsForValue();
@@ -116,11 +123,19 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
         memberEntity.setOicq("");
         memberEntity.setPassword(passWord);
         memberEntity.setRegisterip(IPUtils.getIpAddr(request));
+        memberEntity.setApplystate("未申请");
+        memberEntity.setSource("www");
+        memberEntity.setRegisterdate(new Date());
+        memberEntity.setUpdatedate(new Date());
+        memberEntity.setLevels(1);
+        memberEntity.setLasttime(new Date());
         memberDao.insert(memberEntity);
         memberDao.insertUserAccess(userName);
 
     }
 
+
+
     @Override
     public void updatePass(Map<String, Object> params) {
         String id = params.get("id") == null ? "" : String.valueOf(params.get("id"));//用户ID
@@ -446,6 +461,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
                 Document document = DocumentHelper.parseText(post);
                 // 获取returnstatus节点对象
                 String returnstatus = document.selectSingleNode("//returnstatus").getText();
+                log.info("发送验证码返回信息"+post);
+                System.out.println(post);
                 if (returnstatus.equals("Success")) {
                     //保存验证码信息log_message表
                     state = "发送成功";

src/main/java/io/office/modules/manage/service/impl/NewsServiceImpl.java

@@ -570,5 +570,33 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
         return page;
     }
 
+    @Override
+    public Page<NewsEntity> zhbdList(NewsParams newsParams, Page page) {
+        List<NewsEntity> list = this.newsDao.zhbdList(newsParams,page);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Page<NewsEntity> bzkydtList(NewsParams newsParams, Page page) {
+        List<NewsEntity> list = this.newsDao.bzkydtList(newsParams,page);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Page<NewtopicEntity> sdztList(NewsParams newsParams, Page page) {
+        List<NewtopicEntity> list = this.newsDao.sdztList(newsParams,page);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Page<NewsMovieEntity> jcspList(NewsParams newsParams, Page page) {
+        List<NewsMovieEntity> list = this.newsDao.jcspList(newsParams,page);
+        page.setRecords(list);
+        return page;
+    }
+
 
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/TimescodeRegiServiceImpl.java

@@ -10,6 +10,7 @@ import io.office.modules.manage.entity.LogMessageEntity;
 import io.office.modules.manage.entity.TimescodeRegiIpEntity;
 import io.office.modules.manage.service.LogMessageService;
 import io.office.modules.manage.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.dom4j.Document;
@@ -41,6 +42,7 @@ import javax.servlet.http.HttpSession;
 
 
 @Service("timescodeRegiService")
+@Slf4j
 public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, TimescodeRegiEntity> implements TimescodeRegiService {
 
     @Autowired
@@ -204,9 +206,12 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
                 };
 
                 String post = sendPost("http://39.106.204.178:8888/sms.aspx", data);
+                log.info("login验证码发送信息:"+post);
                 Document document = DocumentHelper.parseText(post);
                 // 获取returnstatus节点对象
                 String returnstatus = document.selectSingleNode("//returnstatus").getText();
+                log.info("login验证码发送信息:"+returnstatus);
+                log.info("验证码为:"+pass);
                 if (returnstatus.equals("Success")){
                     //保存验证码信息log_message表
                     state="发送成功";

src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java

@@ -123,25 +123,26 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
         }else if (levels==1){
             throw new RRException("无权访问");
         }else if (String.valueOf(levels).length()==4){
-            levels=-99;
+           //levels=-99;
         }else {
             throw new RRException("无权访问");
         }
         //审核状态 0待审核   1审核成功   2审核失败
         //查询审核数据
-        Integer countAll=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,null);//查询 申请总数
-        Integer auditCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,0);//查询  等待审核  0
-        Integer throughCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,1);//查询 通过审核  1
-        Integer notThroughCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,2);//查询 未通过审核  2
+        String levelsStr=levels+"";
+        Integer countAll=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,null);//查询 申请总数
+        Integer auditCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,0);//查询  等待审核  0
+        Integer throughCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,1);//查询 通过审核  1
+        Integer notThroughCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,2);//查询 未通过审核  2
         map.put("countAll",countAll);
         map.put("auditCount",auditCount);
         map.put("throughCount",throughCount);
         map.put("notThroughCount",notThroughCount);
         //查询变更数据
-        Integer countChangeAll=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,null);//查询 申请总数
-        Integer auditChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,0);//查询  等待审核  0
-        Integer throughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,1);//查询 通过审核  1
-        Integer notThroughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,2);//查询 未通过审核  2
+        Integer countChangeAll=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,null);//查询 申请总数
+        Integer auditChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,0);//查询  等待审核  0
+        Integer throughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,1);//查询 通过审核  1
+        Integer notThroughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levelsStr,2);//查询 未通过审核  2
         map.put("countChangeAll",countChangeAll);
         map.put("auditChangeCount",auditChangeCount);
         map.put("throughChangeCount",throughChangeCount);

src/main/resources/mapper/manage/NewsDao.xml

@@ -622,9 +622,63 @@ order by releasedate desc
 
 
     </select>
-
-
-
+    <select id="zhbdList" resultType="io.office.modules.manage.entity.NewsEntity">
+        SELECT
+	ltrim(b.name) classname ,a.*
+FROM
+	news a
+LEFT JOIN newsclass b ON a.classid = b.id
+WHERE
+	status = 1
+AND levels > 0
+AND (
+	classid = 5
+	OR (
+		classid IN (
+			SELECT
+				id
+			FROM
+				newsClass
+			WHERE
+				p_id = 5
+		)
+	)
+)
+ORDER BY
+	levels DESC,
+	a.showtime DESC,
+	a.id DESC
+    </select>
+    <select id="bzkydtList" resultType="io.office.modules.manage.entity.NewsEntity">
+        SELECT
+	*
+FROM
+	news
+WHERE
+	status = 1
+AND levels > 0
+AND classid IN (32, 33)
+ORDER BY
+	levels DESC,
+	showtime DESC,
+	id DESC
+    </select>
+    <select id="sdztList" resultType="io.office.modules.manage.entity.NewtopicEntity">
+select * from newtopic where levels>0 and parentid=0 and checkflag=1 order by levels desc,showtime desc,classid desc
+    </select>
+    <select id="jcspList" resultType="io.office.modules.manage.entity.NewsMovieEntity">
+        SELECT
+	*
+FROM
+	news_movie
+WHERE
+	status = 1
+AND levels > 0
+ORDER BY
+	levels DESC,
+	showtime DESC,
+	id DESC
+    </select>
 
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/manage/TycpdmFirmChangeDao.xml

@@ -58,7 +58,7 @@
     <select id="findTycpdmFirmLogoutFlagCountALL"  parameterType="java.lang.Integer" resultType="java.lang.Integer">
         select count(*) from tycpdm_firm_change  a left join tycpdm_user_service b   on a.f_id=b.f_id
         where 1=1
-        <if test="levels ==-99">
+        <if test="levels.length==4">
             and branchcode=#{levels}
         </if>
         <if test="logout_flag !=null">
@@ -70,16 +70,19 @@
 
 
     <select id="selectTycpdmFirmList" resultMap="tycpdmFirmChangeMap" parameterType="java.util.Map">
-        select * from tycpdm_firm_change where 1=1
+        select a.* from tycpdm_firm_change a left join tycpdm_user_service b   on a.f_id=b.f_id
+        where 1=1
         <if test="params.firmName !='' and params.firmName !=null">
-            and firmName like concat('%',#{params.firmName},'%')
+            and a.firmName like concat('%',#{params.firmName},'%')
         </if>
         <if test="params.logout_flag !='' and params.logout_flag !=null">
-            and logout_flag =#{params.logout_flag}
+            and a.logout_flag =#{params.logout_flag}
         </if>
         <if test="params.branchCode !='' and params.branchCode !=null">
-            and branchCode =#{params.branchCode}
+            and a.branchCode =#{params.branchCode}
         </if>
+        and  a.logout_flag is not null
+        and logout_flag &lt;&gt;-1
 
     </select>
 

src/main/resources/mapper/manage/TycpdmFirmDao.xml

@@ -54,9 +54,9 @@
     </resultMap>
 
     <select id="findTycpdmFirmLogoutFlagCountALL"  parameterType="java.lang.Integer" resultType="java.lang.Integer">
-        select count(*) from tycpdm_firm  a left join tycpdm_user_service b   on a.f_id=b.f_id
+        select count(*) from tycpdm_firm  a left join tycpdm_user_service b   on a.f_id=b.f_id 
         where 1=1
-        <if test="levels ==-99">
+        <if test="levels.length==4">
             and branchcode=#{levels}
         </if>
         <if test="logout_flag !=null">
@@ -68,17 +68,19 @@
 
 
     <select id="selectTycpdmFirmList" resultMap="tycpdmFirmMap" parameterType="java.util.Map">
-        select * from tycpdm_firm where 1=1
+        select a.* from tycpdm_firm a left join tycpdm_user_service b   on a.f_id=b.f_id
+        where 1=1
         <if test="params.firmName !='' and params.firmName !=null">
-            and firmName like concat('%',#{params.firmName},'%')
+            and a.firmName like concat('%',#{params.firmName},'%')
         </if>
         <if test="params.logout_flag !='' and params.logout_flag !=null">
-            and logout_flag =#{params.logout_flag}
+            and a.logout_flag =#{params.logout_flag}
         </if>
         <if test="params.branchCode !='' and params.branchCode !=null">
-            and branchCode =#{params.branchCode}
+            and a.branchCode =#{params.branchCode}
         </if>
-
+        and  a.logout_flag is not null
+        and logout_flag &lt;&gt;-1
     </select>
 
 </mapper>
\ No newline at end of file