merge conflit

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/SubjectServiceImpl.java

@@ -12,7 +12,6 @@ import com.usoftchina.smartschool.school.dto.ListReqDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.SubjectMapper;
 import com.usoftchina.smartschool.school.po.Subject;
-import com.usoftchina.smartschool.school.po.SysStudent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -51,13 +50,23 @@ public class SubjectServiceImpl implements SubjectService {
         }
         Long id = formdata.getSubject_id();
         Long school = BaseContextHolder.getSchoolId();
+        Integer check = 0;
         if (StringUtils.isEmpty(id) || "0".equals(id.toString())) {
             formdata.setSchool_id(school);
             formdata.setSubject_status(1);
+            //检测科目是否存在
+            check = subjectMapper.checkSubject(formdata.getSubject_name());
+            if (check > 0) {
+                throw new BizException(BizExceptionCode.EXISTS_SUBJECT);
+            }
             subjectMapper.insertSelective(formdata);
            id = formdata.getSubject_id();
         } else {
             //更新
+            check = subjectMapper.checkSubject(formdata.getSubject_name());
+            if (check > 0) {
+                throw new BizException(BizExceptionCode.EXISTS_SUBJECT);
+            }
             subjectMapper.updateByPrimaryKeySelective(formdata);
         }
         return new DocBaseDTO(formdata.getSubject_id());

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/NoticeServiceImpl.java

@@ -24,6 +24,7 @@ import com.usoftchina.smartschool.wechat.api.WechatApi;
 import com.usoftchina.smartschool.wechat.dto.MessageInfoDTO;
 import com.usoftchina.smartschool.wechat.dto.TransferDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -49,6 +50,9 @@ public class NoticeServiceImpl implements NoticeService{
     @Autowired
     private SchoolTemplateMapper schoolTemplateMapper;
 
+    @Value("${smartschool.domain.wechat}")
+    private String baseWechatUrl;
+
 
     @Override
     public DocBaseDTO save(Notify formdata) {
@@ -137,17 +141,27 @@ public class NoticeServiceImpl implements NoticeService{
         }
         noticers.forEach(noticer -> {
             MessageInfoDTO msg = new MessageInfoDTO();
-            msg.setTitle(data.getNotify_title());
-            msg.setKeyword1(school.getSchool_name());
-            msg.setKeyword2("校办公室");
-            msg.setKeyword3(DateUtils.format());
-            msg.setKeyword4(data.getNotify_details());
-            msg.setRemark(data.getNotify_remarks());
-            msg.setTemplateId(template.getSt_templateid());
-            msg.setTouser(noticer.getOpenid());
-            msg.setAppId(school.getSchool_appid());
-            msg.setSecret(school.getSchool_secret());
-            msgs.add(msg);
+            String endUrl = null;
+            if (!StringUtils.isEmpty(noticer.getType()) || !StringUtils.isEmpty(noticer.getPersonId())) {
+                if ("1".equals(noticer.getType().split(",")[0])) {
+                    endUrl = "/parent/" + id + "?stuId=" + noticer.getPersonId().split(",")[0];
+                } else {
+                    endUrl = "/teacher/" + id + "?teacherId=" + noticer.getPersonId().split(",")[0];
+                }
+                String url = baseWechatUrl + "/notifyDetail" + endUrl;
+                msg.setUrl(url);
+                msg.setTitle(data.getNotify_title());
+                msg.setKeyword1(school.getSchool_name());
+                msg.setKeyword2("校办公室");
+                msg.setKeyword3(DateUtils.format());
+                msg.setKeyword4(data.getNotify_details());
+                msg.setRemark("谢谢使用!");
+                msg.setTemplateId(template.getSt_templateid());
+                msg.setTouser(noticer.getOpenid());
+                msg.setAppId(school.getSchool_appid());
+                msg.setSecret(school.getSchool_secret());
+                msgs.add(msg);
+            }
         });
         if (msgs.size() > 0) {
             TransferDTO transferDTO = new TransferDTO();

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/exception/BizExceptionCode.java

@@ -21,6 +21,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     EXISTS_CURRICULUM(500005,"存在课表,无法删除"),
     EXISTS_TEACHER_CLASS(500006,"存在任课班级,无法删除"),
     TEACHERS_EXISTS_CLASS(500006,"%s存在任课班级,无法删除"),
+    EXISTS_SUBJECT(500007,"科目已存在"),
     EXISTS_SUBJECT_TEACHER(5000012, "该课程存在班级与任课教师,禁止删除"),
     EXISTS_SCORE_PUBLISH(5000013, "存在已发布成绩,禁止删除"),
     EXISTS_CLASS(500011, "存在班级,无法删除"),

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SubjectMapper.java

@@ -26,4 +26,6 @@ public interface SubjectMapper {
     Integer checkTeacherClass(Long id);
 
     Integer checkCurriculum(Long id);
+
+    Integer checkSubject(String subject_name);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/SchoolNoticer.java

@@ -19,4 +19,12 @@ public class SchoolNoticer implements Serializable{
      * 微信ID
      */
     private String openid;
+    /**
+     * 推送人ID
+     */
+    private String personId;
+    /**
+     * 类型   1：家长   0：教师
+     */
+    private String type;
 }

applications/school/school-server/src/main/resources/mapper/NotifyMapper.xml

@@ -227,7 +227,8 @@
   </select>
 
     <select id="selectNoticer" parameterType="long" resultType="com.usoftchina.smartschool.school.po.SchoolNoticer">
-        select openid,parents_name noticer from sys_parents where school_id=#{schoolId} and ifnull(openid,'') != '' and parents_status=1 union
-				select openid,teacher_name noticer from sys_teacher where school_id=#{schoolId} and ifnull(openid,'') != '' and teacher_status=1;
+        select openid,noticer,GROUP_CONCAT(personId) personId,GROUP_CONCAT(type) type from (
+        select openid,parents_name noticer,parentstu.stu_id personId,'1' type from sys_parents parent left join sys_parents_stu parentstu on parent.parent_id = parentstu.parent_id where school_id=#{schoolId} and ifnull(openid,'') != '' and parents_status=1  union
+        select openid,teacher_name noticer,teacher_id personId, '0' type from sys_teacher where school_id=#{schoolId} and ifnull(openid,'') != '' and teacher_status=1 ) tab_  GROUP BY openid,noticer
     </select>
 </mapper>

applications/school/school-server/src/main/resources/mapper/SubjectMapper.xml

@@ -110,4 +110,8 @@
     cur_tues=#{id} or cur_wed=#{id} or cur_thur=#{id} or cur_fri=#{id}
     or cur_sat=#{id}
   </select>
+
+  <select id="checkSubject" parameterType="String" resultType="integer">
+    select count(1) from subject where  subject_name= #{subject_name}
+  </select>
 </mapper>